genmodel 0.0.42 → 0.0.44

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2c2eb418e6347ae5ad8a9447cff3debce26aee40
-  data.tar.gz: c8e15d5e32d6477c58597deb154eebbb13181e58
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzU3MmMwZWQ1ZTU5OGU4Y2U0NGZjODQ4OGM3ZTMwNTFhNzA4OTU3Nw==
+  data.tar.gz: !binary |-
+    MzBmMmZhYzgyNGI5OTE3MTQ0YWMxYTcyYzUyNTM4OTQ5YWUxMTJmNQ==
 SHA512:
-  metadata.gz: 6f7a89e77f0c1a9897b84e1b1d0403733222b318fec05b670102c929f599e6095b259757644b808b521d7cd658b4595fe2f98a4782c598174e42dfe123225ec5
-  data.tar.gz: 0ce51d8f03618e9e241ee9966f7c6fe4f0c41bc11c86ee53e44746f9e9b3e1e3db31e3d4ab2f661d38172012b70578cadc6eb49db1043cbab68f854c3f6b6a41
+  metadata.gz: !binary |-
+    NWI3ZDk0M2RlZmRlZmNlYTg0OThkYWM4NDY1ZDMyOGZjYWY2Y2UzNWQ2ZmNl
+    ZjgwOGRhNzQ3YjgwYzlkOWVkNjkzM2IxNWI0MDcxYmQ5M2RkMzBiYWY4NTE3
+    NTZiM2ZmOGY1MzFiOGYyN2I0MjQ5NDZkOWQ5OGNjYjRmNTBiZjc=
+  data.tar.gz: !binary |-
+    ZDU0NjdjNTRiNDQxM2RiMWEyNjBkMGE5Mzg3YzEwZWQ3MDFlYmYxZTU3YmI3
+    MmNiOGFkYmJiMzVjZmVjZGUyMzkzMGRhMTI1YmYwMmNkN2E0M2RjMjAzMjE2
+    ZWEwZmYyY2YzYWM1ZmY1NWJlMjllNWU0ZDc5ODFlN2I3OThjNGY=

data/ext/Genmodel/GenModel.h

@@ -134,6 +134,8 @@ public:
     virtual long MakeConstraintFeasible(long row);
     virtual long MakeAllConstraintFeasible(long max_iter = -1);
     virtual long PrintRowInfo(long row);
+    virtual string GetStatusString();
+    //virtual string Serialize();
     bool binit;
     bool bcreated;
     string name;

data/ext/Genmodel/GenModelBase.cpp

@@ -15,6 +15,7 @@ GenModel::GenModel()
 {
     version = "genmodel-0.0.39 build 0001";
     hassolution = false;
+    solstat = numeric_limits<int>::infinity();
     bcreated = false;
     binit = false;
 	nc=0;
@@ -31,14 +32,14 @@ bool GenModel::IsAvailable()
 double GenModel::FindConstraintMaxLhs(long row)
 {
     double total = 0.0;
-    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    for(size_t i = 0; i < consts[row].cols.size(); i++)
         total += (consts[row].coefs[i] >= 0 ? vars.ub[consts[row].cols[i]] : vars.lb[consts[row].cols[i]])*consts[row].coefs[i];
     return total;
 }
 
 long GenModel::UpdateVariableBoundsMax(long row)
 {
-    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    for(size_t i = 0; i < consts[row].cols.size(); i++)
     {
         if(fabs(vars.lb[consts[row].cols[i]] - vars.ub[consts[row].cols[i]]) > 1e-7)
             hasinfeasibilities = true;
@@ -53,14 +54,14 @@ long GenModel::UpdateVariableBoundsMax(long row)
 double GenModel::FindConstraintMinLhs(long row)
 {
     double total = 0.0;
-    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    for(size_t i = 0; i < consts[row].cols.size(); i++)
         total += (consts[row].coefs[i] >= 0 ? vars.lb[consts[row].cols[i]] : vars.ub[consts[row].cols[i]])*consts[row].coefs[i];
     return total;
 }
 
 long GenModel::UpdateVariableBoundsMin(long row)
 {
-    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    for(size_t i = 0; i < consts[row].cols.size(); i++)
     {
         if(fabs(vars.lb[consts[row].cols[i]] - vars.ub[consts[row].cols[i]]) > 1e-7)
             hasinfeasibilities = true;
@@ -342,7 +343,7 @@ long GenModel::SetQpCoef(long i, long j, double val)
 long GenModel::AddModelCol(vector<int>& ind, vector<double>& val, double obj, double lb, double ub, string name, char type)
 {
 	AddVar(name, obj, lb, ub, type);
-	for(long i = 0; i < long(ind.size()); i++)
+	for(size_t i = 0; i < ind.size(); i++)
 		AddNz(ind[i], vars.n-1, val[i]);
 
 	return 0;
@@ -351,7 +352,7 @@ long GenModel::AddModelCol(vector<int>& ind, vector<double>& val, double obj, do
 long GenModel::AddModelRow(vector<int>& ind, vector<double>& val, double rhs, char sense, string name)
 {
 	AddConst(name, rhs, sense);
-	for(long i = 0; i < long(ind.size()); i++)
+	for(size_t i = 0; i < ind.size(); i++)
 		AddNzToLast(ind[i], val[i]);
 
 	return 0;
@@ -391,6 +392,25 @@ double GenModel::GetMIPRelativeGap()
     return 0.0;
 }
 
+string GenModel::GetStatusString()
+{
+    char cstr[256];
+    snprintf(cstr, 256, "Status value %d", solstat);
+    return string(cstr);
+}
+
+/*string Serialize()
+{
+    string name;
+    vector<ModConsts> consts;
+    ModVars vars;
+    void* solverdata;
+    map<string, long> longParam;
+    map<string, double> dblParam;
+    map<string, bool> boolParam;
+    map<string, string> strParam;
+}*/
+
 long ModVars::AddVar(string nn, double o, double l, double u, char t)
 {
 	//offset[nn] = n;