genmodel 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b54ab1381b33c1380ebda83e1f813fd46a56ebc
-  data.tar.gz: eb1cefbd649a4964c6a27ce07ca758079351c8b5
+  metadata.gz: 841759fecd601b6fe9986e0066c9719a556a4d56
+  data.tar.gz: 1813d26c133f042f4f46936f1e99947dc57e6f2d
 SHA512:
-  metadata.gz: a79b76df7e6d61ff74159434ec297621c32f7b3f6918906f19d185f9b6f1e1540bb2323b6d444e9f44ff5a2bc18b64bfc8261947555b36a09c7fa5a3f40d06ae
-  data.tar.gz: c01e743f1213f8d01fbb61bd93f81e69404d2da887215b10c66692a5aab3baf63650eb08bc03dbbfb91687df8ed47b077aeedeb5e556975e3ed1b4d1ca69333e
+  metadata.gz: 7bdf45893f13bccd8b9243c1039f09f67f023f88e0c16b757f570e5032710e5b611dd031dd13590768f4f3ba133f75bcb06f34a6f4e0d16e1edd2d32ddb11966
+  data.tar.gz: a4aad7481b5da167147239fa0c907586336e656856e3188e22ec075f3d5c403a9fb4048a90df2250a40614dec38607deba62013b4dc1ac960e1393a2643890aa

data/ext/Genmodel/GenModel.h

@@ -129,6 +129,7 @@ public:
     virtual double FindConstraintMaxLhs(long row);
     virtual double FindConstraintMinLhs(long row);
     virtual long MakeConstraintFeasible(long row);
+    virtual long PrintRowInfo(long row);
     bool binit;
     bool bcreated;
     string name;

data/ext/Genmodel/GenModelBase.cpp

@@ -3,6 +3,14 @@
 #include <math.h>
 #include <time.h>
 
+#define GM_RED     "\x1b[31m"
+#define GM_GREEN   "\x1b[32m"
+#define GM_YELLOW  "\x1b[33m"
+#define GM_BLUE    "\x1b[34m"
+#define GM_MAGENTA "\x1b[35m"
+#define GM_CYAN    "\x1b[36m"
+#define GM_RESET   "\x1b[0m"
+
 GenModel::GenModel()
 {
     version = "genmodel-0.0.24 build 0001";
@@ -31,28 +39,77 @@ double GenModel::FindConstraintMinLhs(long row)
     return total;
 }
 
+long GenModel::PrintRowInfo(long row)
+{
+    printf(GM_GREEN "%s : " GM_RESET, consts[row].name.c_str());
+    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    {
+        if(i==0)
+            printf(GM_RED "%f" GM_CYAN "*" GM_RESET "%s", consts[row].coefs[i], vars.name[consts[row].cols[i]].c_str());
+        else
+            printf(GM_CYAN " + " GM_RED "%f" GM_CYAN "*" GM_RESET "%s", consts[row].coefs[i], vars.name[consts[row].cols[i]].c_str());
+    }
+    
+    printf(GM_CYAN "%c" GM_RED " %f" GM_RESET "\n", ( consts[row].sense == 'L' ? '<' : (consts[row].sense == 'E' ? '=' : '>')), consts[row].lrhs );
+    printf(GM_GREEN "%s : " GM_RESET, consts[row].name.c_str());
+    
+    double min_val = 0.0;
+    double max_val = 0.0;
+    
+    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    {
+        double low = consts[row].coefs[i]*vars.lb[consts[row].cols[i]];
+        double high = consts[row].coefs[i]*vars.ub[consts[row].cols[i]];
+        min_val += low;
+        max_val += high;
+        if(i==0)
+            printf("[" GM_RED "%f" GM_GREEN "%f" GM_RESET "]", low, high);
+        else
+            printf(GM_CYAN " + " GM_RESET "[" GM_RED "%f" GM_GREEN "%f" GM_RESET "]", low, high);
+    }
+    printf("%c [" GM_RED "%f " GM_RESET "%f " GM_GREEN "%f" GM_RESET "\n\n", ( consts[row].sense == 'L' ? '<' : (consts[row].sense == 'E' ? '=' : '>')), min_val, consts[row].lrhs, max_val );
+    
+    return 0;
+}
+
 long GenModel::MakeConstraintFeasible(long row)
 {
     if(consts[row].sense == 'L')
     {
         double min = FindConstraintMinLhs(row);
         if(min > consts[row].lrhs)
+        {
             consts[row].lrhs = min;
+            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+                PrintRowInfo(row);
+        }
     }
     else if(consts[row].sense == 'G')
     {
         double max = FindConstraintMaxLhs(row);
         if(max < consts[row].lrhs)
+        {
             consts[row].lrhs = max;
+            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+                PrintRowInfo(row);
+        }
     }
     else if(consts[row].sense == 'R')
     {
         double min = FindConstraintMinLhs(row);
         double max = FindConstraintMaxLhs(row);
         if(max < consts[row].lrhs)
+        {
             consts[row].lrhs = max;
+            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+                PrintRowInfo(row);
+        }
         else if(min > consts[row].urhs)
+        {
             consts[row].urhs = min;
+            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+                PrintRowInfo(row);
+        }
     }
 
     return 0;

data/ext/Genmodel/Genmodel.cpp

@@ -31195,6 +31195,48 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_PrintRowInfo(int argc, VALUE *argv, VALUE self) {
+  GenModel *arg1 = (GenModel *) 0 ;
+  long arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long val2 ;
+  int ecode2 = 0 ;
+  long result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_GenModel, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "GenModel *","PrintRowInfo", 1, self )); 
+  }
+  arg1 = reinterpret_cast< GenModel * >(argp1);
+  ecode2 = SWIG_AsVal_long(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "long","PrintRowInfo", 2, argv[0] ));
+  } 
+  arg2 = static_cast< long >(val2);
+  {
+    try {
+      result = (long)(arg1)->PrintRowInfo(arg2); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_long(static_cast< long >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModel_binit_set(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -42615,6 +42657,7 @@ SWIGEXPORT void Init_Genmodel(void) {
   rb_define_method(SwigClassGenModel.klass, "FindConstraintMaxLhs", VALUEFUNC(_wrap_GenModel_FindConstraintMaxLhs), -1);
   rb_define_method(SwigClassGenModel.klass, "FindConstraintMinLhs", VALUEFUNC(_wrap_GenModel_FindConstraintMinLhs), -1);
   rb_define_method(SwigClassGenModel.klass, "MakeConstraintFeasible", VALUEFUNC(_wrap_GenModel_MakeConstraintFeasible), -1);
+  rb_define_method(SwigClassGenModel.klass, "PrintRowInfo", VALUEFUNC(_wrap_GenModel_PrintRowInfo), -1);
   rb_define_method(SwigClassGenModel.klass, "binit=", VALUEFUNC(_wrap_GenModel_binit_set), -1);
   rb_define_method(SwigClassGenModel.klass, "binit", VALUEFUNC(_wrap_GenModel_binit_get), -1);
   rb_define_method(SwigClassGenModel.klass, "bcreated=", VALUEFUNC(_wrap_GenModel_bcreated_set), -1);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - Mathieu Bouchard