genmodel 0.0.44 → 0.0.45
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 +8 -8
- data/ext/Genmodel/GenModelCplex.cpp +4 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
---
|
|
2
2
|
!binary "U0hBMQ==":
|
|
3
3
|
metadata.gz: !binary |-
|
|
4
|
-
|
|
4
|
+
NzE1MTkzMDk2ZDZhY2Q1MjMyZjMzM2RmN2Q4Y2U3ODFiODQyYmRhMQ==
|
|
5
5
|
data.tar.gz: !binary |-
|
|
6
|
-
|
|
6
|
+
M2NlMDcyMGY4YzkxMmZjNTQxYjEzN2VjZWEzNDhmZjJmMTRiYmNlMg==
|
|
7
7
|
SHA512:
|
|
8
8
|
metadata.gz: !binary |-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
ZjBkZDE3ZWZiZjIxYmEzNjQ1M2Q5NjM3ZDFlNzY5YWY3YjNjZDRmZDQ5MGNh
|
|
10
|
+
MjAwNmM1MzNhYWM4NWViZDQwOTU3NTY1YTNiYjQ0NjRjZmRhNTYwOTlmNTA0
|
|
11
|
+
YzEzZTA1ZDYxYzlmNzUzYTkwYzIxY2U1NDk4ODM5YjVlYjdkNjc=
|
|
12
12
|
data.tar.gz: !binary |-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
NTcyMzBmMDJiNGVlMjNkYTNkZDJlZDJjMzIxZDViYzJkZTgyMzM3ZTk1MzJl
|
|
14
|
+
MGFiYWY0YzM1OWU5MGM2YzQxYzQ1OGMwMGY2OWM0NDk5MjNmNmJhODBlNjU3
|
|
15
|
+
NmIwZGQwN2M2NmQyYjQ4ODc0MTRmMzc3MzMyMTM0MDllYTgwOTE=
|
|
@@ -185,7 +185,7 @@ long GenModelCplex::AddCut(int* cols, double* vals, int nz, double rhs, char sen
|
|
|
185
185
|
if(!bcreated)
|
|
186
186
|
return ThrowError("AddCut() not available : Problem not created yet");
|
|
187
187
|
CplexData* d = (CplexData*)solverdata;
|
|
188
|
-
|
|
188
|
+
CPXNNZ rmatbeg = 0;
|
|
189
189
|
|
|
190
190
|
CPXXaddrows(d->env, d->lp, 0, 1, nz, &rhs, &sense, &rmatbeg, cols, vals, NULL, (char**)(&name));
|
|
191
191
|
d->nr++;
|
|
@@ -208,7 +208,7 @@ long GenModelCplex::AddCol(int* newi, double* newcol, int nz, double obj, double
|
|
|
208
208
|
if(!bcreated)
|
|
209
209
|
return ThrowError("AddCol() not available : Problem not created yet");
|
|
210
210
|
CplexData* d = (CplexData*)solverdata;
|
|
211
|
-
|
|
211
|
+
CPXNNZ cmatbeg = 0;
|
|
212
212
|
|
|
213
213
|
double clb = lb;
|
|
214
214
|
if(clb == numeric_limits<double>::infinity())
|
|
@@ -353,7 +353,7 @@ long GenModelCplex::CreateModel()
|
|
|
353
353
|
|
|
354
354
|
vector<vector<pair<int,double> > > qptemp;
|
|
355
355
|
qptemp.resize(nc);
|
|
356
|
-
|
|
356
|
+
CPXNNZ* qpbeg = NULL;
|
|
357
357
|
int* qpnum = NULL;
|
|
358
358
|
int* qpind = NULL;
|
|
359
359
|
double* qpv = NULL;
|
|
@@ -639,7 +639,7 @@ SolverInfo GenModelCplex::GetSolverInfo()
|
|
|
639
639
|
return SolverInfo();
|
|
640
640
|
}
|
|
641
641
|
CplexData* d = static_cast<CplexData*>(solverdata);
|
|
642
|
-
|
|
642
|
+
|
|
643
643
|
if(solstat == numeric_limits<int>::infinity())
|
|
644
644
|
d->solver_info.status_str = "No status assigned.";
|
|
645
645
|
else
|
|
@@ -649,7 +649,6 @@ SolverInfo GenModelCplex::GetSolverInfo()
|
|
|
649
649
|
if (_status == NULL)
|
|
650
650
|
ThrowError(string("Failure to get the status string"));
|
|
651
651
|
d->solver_info.status_str = status_str;
|
|
652
|
-
printf("GetSolverInfo : status = %s [%s] [%s]\n", _status, status_str, d->solver_info.status_str.c_str());
|
|
653
652
|
}
|
|
654
653
|
|
|
655
654
|
return d->solver_info;
|