genmodel 0.0.31 → 0.0.32
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/Genmodel/GenModelOsi.cpp +6 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 6b54ab1381b33c1380ebda83e1f813fd46a56ebc
|
|
4
|
+
data.tar.gz: eb1cefbd649a4964c6a27ce07ca758079351c8b5
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a79b76df7e6d61ff74159434ec297621c32f7b3f6918906f19d185f9b6f1e1540bb2323b6d444e9f44ff5a2bc18b64bfc8261947555b36a09c7fa5a3f40d06ae
|
|
7
|
+
data.tar.gz: c01e743f1213f8d01fbb61bd93f81e69404d2da887215b10c66692a5aab3baf63650eb08bc03dbbfb91687df8ed47b077aeedeb5e556975e3ed1b4d1ca69333e
|
|
@@ -277,7 +277,9 @@ long GenModelOsi::Solve()
|
|
|
277
277
|
generator->numberTimesEntered(),generator->numberCutsInTotal(), generator->numberCutsActive()); printmsg(tmp, this);
|
|
278
278
|
}
|
|
279
279
|
|
|
280
|
-
hassolution = d->mipmodel->
|
|
280
|
+
//hassolution = d->mipmodel->bestSolution() != NULL;
|
|
281
|
+
printf("Number of solution = %d\n", d->mipmodel->getSolutionCount());
|
|
282
|
+
hassolution = d->mipmodel->getSolutionCount() > 0;
|
|
281
283
|
objval = d->mult*d->mipmodel->getObjValue();
|
|
282
284
|
|
|
283
285
|
d->model = d->mipmodel->solver();
|
|
@@ -326,7 +328,10 @@ long GenModelOsi::SetSol()
|
|
|
326
328
|
vars.rc.resize(vars.n,0);
|
|
327
329
|
|
|
328
330
|
if(!hassolution)
|
|
331
|
+
{
|
|
332
|
+
solstat = 2;
|
|
329
333
|
return 1;
|
|
334
|
+
}
|
|
330
335
|
|
|
331
336
|
const double* sol;
|
|
332
337
|
const double* act;
|