Ticket #7024: test_libs_linprogram.patch

src/tests/libs/linprog/Jamfile

@@ -2 +2 @@
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+UsePrivateHeaders shared ;
+
 UseLibraryHeaders lp_solve linprog ;
 
 SimpleTest linprog_test :
     Program.cpp
     :
-    be liblpsolve55.so liblinprog.so $(TARGET_LIBSUPC++)
+    be liblpsolve55.so liblinprog.a $(TARGET_LIBSUPC++)
 ;

src/tests/libs/linprog/Program.cpp

@@ -4 +4 @@
  * Distributed under the terms of the MIT License.
  */
 
-#include <List.h>
+#include <ObjectList.h>
 #include <SupportDefs.h>
 
 #include "LinearSpec.h"
 
 #include <stdio.h>
 
+using namespace LinearProgramming;
 
 void
 PrintVars(LinearSpec* ls)
 {
-    int32 size = ls->Variables()->CountItems();
+    int32 size = ls->Variables().CountItems();
     Variable* variable;
-    for (int i = 0; i < size; i++) {
-        variable = (Variable*)ls->Variables()->ItemAt(i);
+    for (int32 i = 0; i < size; i++) {
+        variable = (Variable*)ls->Variables().ItemAt(i);
         printf("%f ", variable->Value());
     }
     printf("%d\n", ls->Result());
@@ -32 +33 @@
     Variable* x1 = ls->AddVariable();
     Variable* x2 = ls->AddVariable();
     
-    Constraint* c1 = ls->AddConstraint(1.0, x1, OperatorType(LE), 108); 
-    Constraint* c2 = ls->AddConstraint(1.0, x2, OperatorType(GE), 113);
+    Constraint* c1 = ls->AddConstraint(1.0, x1, OperatorType(kLE), 108);    
+    Constraint* c2 = ls->AddConstraint(1.0, x2, OperatorType(kGE), 113);
     
-    BList* summands = new BList(2);
+    SummandList* summands = new SummandList(2);
     summands->AddItem(new Summand(1.0, x1));
     summands->AddItem(new Summand(1.0, x2));
-    ls->SetObjFunction(summands);
-    
+    ls->SetObjectiveFunction(summands);
+
     ls->Solve();
     PrintVars(ls);
-    
+
+    delete c1;
     delete c2;
     ls->Solve();
     PrintVars(ls);
     
-    c2 = ls->AddConstraint(1.0, x2, OperatorType(GE), 113);
+    c2 = ls->AddConstraint(1.0, x2, OperatorType(kGE), 113);
     ls->Solve();
     PrintVars(ls);
 }