Changeset 413 for branches/devel/Cbc/examples

Timestamp:

Jul 14, 2006 3:02:05 PM (15 years ago)

Author:

forrest

Message:

example

File:

• branches/devel/Cbc/examples/lotsizeSimple.cpp (modified) (3 diffs)

branches/devel/Cbc/examples/lotsizeSimple.cpp

@@ -41 +41 @@
   // Read in model using argv[1]
   // and assert that it is a clean model
-  std::string mpsFileName = "miplib3/10teams";
+  std::string mpsFileName = "miplib3/bell3a";
   if (argc>=2) mpsFileName = argv[1];
   int numMpsReadErrors = solver1.readMps(mpsFileName.c_str(),"");
@@ -69 +69 @@
   CbcObject ** objects = new CbcObject * [numberLot];
   double * points = new double [largestBound+1];
+  // If extra parameter not numeric then every second
   bool ordinary = argc==2;
+  int increment=2;
+  if (!ordinary&&argc>2) {
+    int value = atoi(argv[2]);
+    if (value>2) {
+      printf("Using increment of %d\n",value);
+      increment=value;
+    }
+  } 
   CoinIotaN(points,largestBound+1,0.0);
   
@@ -84 +93 @@
         int i;
         int n=0;
-        if (((iUp-iLo)&1)==0) {
-          // every second
-          for (i=iLo;i<=iUp;i+=2) 
-            points[n++]=i;
-        } else {
-          // iLo,iLo+1 then every second
-          points[n++]=iLo;
-          for (i=iLo+1;i<=iUp;i+=2) 
-            points[n++]=i;
-        }
+        if (increment==2) {
+          if (((iUp-iLo)&1)==0) {
+            // every second
+            for (i=iLo;i<=iUp;i+=2) 
+              points[n++]=i;
+          } else {
+            // iLo,iLo+1 then every second
+            points[n++]=iLo;
+            for (i=iLo+1;i<=iUp;i+=2) 
+              points[n++]=i;
+          }
+        } else {
+          for (i=iLo;i<=iUp;i+=increment) 
+            points[n++]=i;
+          if (i-increment!=iUp)
+            points[n++]=iUp; // add in last
+        }
         objects[numberLot++]= new CbcLotsizeSimple(&model,iColumn,n,
                                                    points);