Changeset 30553e1 in tol

Timestamp:

Oct 21, 2008, 11:00:18 AM (18 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

8f0ce25

Parents:

14c595e

Message:

Fixed bug in Write.Constraints

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@37 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/_import.tol (modified) (1 diff)

tol/stdlib/math/stat/models/bayesian/bysMcmc/bsr/_import.tol

@@ -301 +301 @@
   {
     Set gc = handler::Get.GenericConstraint(r);
-    Real lb = GT(gc->LowerBound,-1/0);
-    Real ub = LT(gc->UpperBound,+1/0);
-    Text exp =  If(!Card(gc->LinearComb),"", SetSum(
+    Real lb = And(!IsUnknown(gc->LowerBound),GT(gc->LowerBound,-1/0));
+    //WriteLn("TRACE gc->LowerBound ="<<gc->LowerBound);
+    Real ub = And(!IsUnknown(gc->UpperBound),LT(gc->UpperBound,+1/0));
+    //WriteLn("TRACE gc->UpperBound ="<<gc->UpperBound);
+    //WriteLn("TRACE lb ="<<lb+" ub="<<ub);
+    Text expr =  If(!Card(gc->LinearComb),"", SetSum(
       EvalSet(gc->LinearComb, Text(Bsr.LinearCombTerm term)
       {
         If(term->Coefficient==0,"",
-          "" <<term->Coefficient+"*"<<term->Parameter)
+          RealTextS(term->Coefficient)+"*"<<term->Parameter)
       })));
     If(lb, FPutText(f, RealTextS(gc->LowerBound)+"<="+expr+";\n"));
-    If(ub, FPutText(f, RealTextS(gc->LowerBound)+">="+expr+";\n"));
+    If(ub, FPutText(f, RealTextS(gc->UpperBound)+">="+expr+";\n"));
     Real 0
   });