genmodel 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00ca971e4317b62941f01c9b4cb4a68ee0e330b
-  data.tar.gz: f3945cce1eaf1321b20c9cfec104a2c0cc67f77b
+  metadata.gz: 84d9601740ce13fc656d10b5d70b605e87b59cb9
+  data.tar.gz: 785cda2fc57b09eb60ac2e7d0767b491faf0a867
 SHA512:
-  metadata.gz: fbd5de5c51efdcfdd95dc01b16aee1a29f3d934c24b0a49f4fa6408f2b9d59f3fcd4379193996a321c5edbf8ea21984d64340339f0816213046db2641bb09a3a
-  data.tar.gz: f494b386d0255862625d2d1bbf1183563d77d4766e3c2b48e7743c25108e0620df6dc13f188603a897b6052a391a98197a7137053ddde6b7d7494aaefea236d0
+  metadata.gz: 1ebbbf916861c7dc86192e118ae27c68b61dc5cea8d1e1a4f44f5c8199e9fc19e8034daaae17b4d90f10aacd3947d1f55d4ca1a41d3bac267ccba6b746e09135
+  data.tar.gz: 5807e643a00e8baf4793af7c650817030d1703c23542956142940dadfa7450dd4418a2582b0f5ed768870d35e447a331d7af7f8ad493aefd56b81cd331f05f41

data/ext/Genmodel/GenModel.h

@@ -127,8 +127,11 @@ public:
 	virtual long DeleteMipStarts();
 	virtual double GetMIPRelativeGap();
     virtual double FindConstraintMaxLhs(long row);
+    virtual long UpdateVariableBoundsMax(long row);
     virtual double FindConstraintMinLhs(long row);
+    virtual long UpdateVariableBoundsMin(long row);
     virtual long MakeConstraintFeasible(long row);
+    virtual long MakeAllConstraintFeasible(long max_iter = -1);
     virtual long PrintRowInfo(long row);
     bool binit;
     bool bcreated;
@@ -147,6 +150,7 @@ public:
 	bool feasible;
 	bool dualfeasible;
 	bool hassolution;
+    bool hasinfeasibilities;
 	void* solverdata;
 	map<string, long> longParam;
 	map<string, double> dblParam;

data/ext/Genmodel/GenModelBase.cpp

@@ -31,6 +31,20 @@ double GenModel::FindConstraintMaxLhs(long row)
     return total;
 }
 
+long GenModel::UpdateVariableBoundsMax(long row)
+{
+    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    {
+        if(fabs(vars.lb[consts[row].cols[i]] - vars.ub[consts[row].cols[i]]) > 1e-7)
+            hasinfeasibilities = true;
+        if(consts[row].coefs[i] >= 0)
+            vars.lb[consts[row].cols[i]] = vars.ub[consts[row].cols[i]];
+        else
+            vars.ub[consts[row].cols[i]] = vars.lb[consts[row].cols[i]];
+    }
+    return 0;
+}
+
 double GenModel::FindConstraintMinLhs(long row)
 {
     double total = 0.0;
@@ -39,6 +53,20 @@ double GenModel::FindConstraintMinLhs(long row)
     return total;
 }
 
+long GenModel::UpdateVariableBoundsMin(long row)
+{
+    for(int i = 0; i < int(consts[row].cols.size()); i++)
+    {
+        if(fabs(vars.lb[consts[row].cols[i]] - vars.ub[consts[row].cols[i]]) > 1e-7)
+            hasinfeasibilities = true;
+        if(consts[row].coefs[i] >= 0)
+            vars.ub[consts[row].cols[i]] = vars.lb[consts[row].cols[i]];
+        else
+            vars.lb[consts[row].cols[i]] = vars.ub[consts[row].cols[i]];
+    }
+    return 0;
+}
+
 long GenModel::PrintRowInfo(long row)
 {
     printf(GM_GREEN "%s : " GM_RESET, consts[row].name.c_str());
@@ -72,43 +100,62 @@ long GenModel::PrintRowInfo(long row)
     return 0;
 }
 
+long GenModel::MakeAllConstraintFeasible(long max_iter)
+{
+    if(max_iter < 0)
+        max_iter = long(consts.size());
+    hasinfeasibilities = true;
+    long feas_iter = 0;
+    while(hasinfeasibilities && feas_iter++ < max_iter)
+    {
+        hasinfeasibilities = false;
+        for(size_t i = 0; i < consts.size(); i++)
+            MakeConstraintFeasible(i);
+    }
+    return 0;
+}
+
 long GenModel::MakeConstraintFeasible(long row)
 {
     if(consts[row].sense == 'L')
     {
         double min = FindConstraintMinLhs(row);
-        if(min > consts[row].lrhs)
+        if(min  >= consts[row].lrhs - 1e-7)
         {
-            consts[row].lrhs = min;
-            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+            if(min  > consts[row].lrhs+1e-7 && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
                 PrintRowInfo(row);
+            consts[row].lrhs = min;
+            UpdateVariableBoundsMin(row);
         }
     }
     else if(consts[row].sense == 'G')
     {
         double max = FindConstraintMaxLhs(row);
-        if(max < consts[row].lrhs)
+        if(max <= consts[row].lrhs + 1e-7)
         {
-            consts[row].lrhs = max;
-            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+            if(max  < consts[row].lrhs-1e-7 && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
                 PrintRowInfo(row);
+            consts[row].lrhs = max;
+            UpdateVariableBoundsMax(row);
         }
     }
     else if(consts[row].sense == 'R')
     {
         double min = FindConstraintMinLhs(row);
         double max = FindConstraintMaxLhs(row);
-        if(max < consts[row].lrhs)
+        if(max <= consts[row].lrhs + 1e-7)
         {
-            consts[row].lrhs = max;
-            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+            if(max  < consts[row].lrhs-1e-7 && boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
                 PrintRowInfo(row);
+            consts[row].lrhs = max;
+            UpdateVariableBoundsMax(row);
         }
-        else if(min > consts[row].urhs)
+        else if(min >= consts[row].urhs - 1e-7)
         {
-            consts[row].urhs = min;
-            if(boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
+            if(min  > consts[row].urhs+1e-7 &&boolParam.count("log_output_stdout") > 0 && boolParam["log_output_stdout"])
                 PrintRowInfo(row);
+            consts[row].urhs = min;
+            UpdateVariableBoundsMin(row);
         }
     }
 

data/ext/Genmodel/Genmodel.cpp

@@ -31111,6 +31111,48 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_UpdateVariableBoundsMax(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 *","UpdateVariableBoundsMax", 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","UpdateVariableBoundsMax", 2, argv[0] ));
+  } 
+  arg2 = static_cast< long >(val2);
+  {
+    try {
+      result = (long)(arg1)->UpdateVariableBoundsMax(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_FindConstraintMinLhs(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -31153,6 +31195,48 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_UpdateVariableBoundsMin(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 *","UpdateVariableBoundsMin", 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","UpdateVariableBoundsMin", 2, argv[0] ));
+  } 
+  arg2 = static_cast< long >(val2);
+  {
+    try {
+      result = (long)(arg1)->UpdateVariableBoundsMin(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_MakeConstraintFeasible(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -31195,6 +31279,127 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_MakeAllConstraintFeasible__SWIG_0(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 *","MakeAllConstraintFeasible", 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","MakeAllConstraintFeasible", 2, argv[0] ));
+  } 
+  arg2 = static_cast< long >(val2);
+  {
+    try {
+      result = (long)(arg1)->MakeAllConstraintFeasible(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_MakeAllConstraintFeasible__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  GenModel *arg1 = (GenModel *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  long result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",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 *","MakeAllConstraintFeasible", 1, self )); 
+  }
+  arg1 = reinterpret_cast< GenModel * >(argp1);
+  {
+    try {
+      result = (long)(arg1)->MakeAllConstraintFeasible(); 
+    }
+    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_MakeAllConstraintFeasible(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[3];
+  int ii;
+  
+  argc = nargs + 1;
+  argv[0] = self;
+  if (argc > 3) SWIG_fail;
+  for (ii = 1; (ii < argc); ++ii) {
+    argv[ii] = args[ii-1];
+  }
+  if (argc == 1) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_GenModel, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      return _wrap_GenModel_MakeAllConstraintFeasible__SWIG_1(nargs, args, self);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_GenModel, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_long(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_GenModel_MakeAllConstraintFeasible__SWIG_0(nargs, args, self);
+      }
+    }
+  }
+  
+fail:
+  Ruby_Format_OverloadedError( argc, 3, "GenModel.MakeAllConstraintFeasible", 
+    "    long GenModel.MakeAllConstraintFeasible(long max_iter)\n"
+    "    long GenModel.MakeAllConstraintFeasible()\n");
+  
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModel_PrintRowInfo(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -32050,6 +32255,59 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_hasinfeasibilities_set(int argc, VALUE *argv, VALUE self) {
+  GenModel *arg1 = (GenModel *) 0 ;
+  bool arg2 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  
+  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 *","hasinfeasibilities", 1, self )); 
+  }
+  arg1 = reinterpret_cast< GenModel * >(argp1);
+  ecode2 = SWIG_AsVal_bool(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","hasinfeasibilities", 2, argv[0] ));
+  } 
+  arg2 = static_cast< bool >(val2);
+  if (arg1) (arg1)->hasinfeasibilities = arg2;
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_GenModel_hasinfeasibilities_get(int argc, VALUE *argv, VALUE self) {
+  GenModel *arg1 = (GenModel *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",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 *","hasinfeasibilities", 1, self )); 
+  }
+  arg1 = reinterpret_cast< GenModel * >(argp1);
+  result = (bool) ((arg1)->hasinfeasibilities);
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModel_solverdata_set(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -42655,8 +42913,11 @@ SWIGEXPORT void Init_Genmodel(void) {
   rb_define_method(SwigClassGenModel.klass, "DeleteMipStarts", VALUEFUNC(_wrap_GenModel_DeleteMipStarts), -1);
   rb_define_method(SwigClassGenModel.klass, "GetMIPRelativeGap", VALUEFUNC(_wrap_GenModel_GetMIPRelativeGap), -1);
   rb_define_method(SwigClassGenModel.klass, "FindConstraintMaxLhs", VALUEFUNC(_wrap_GenModel_FindConstraintMaxLhs), -1);
+  rb_define_method(SwigClassGenModel.klass, "UpdateVariableBoundsMax", VALUEFUNC(_wrap_GenModel_UpdateVariableBoundsMax), -1);
   rb_define_method(SwigClassGenModel.klass, "FindConstraintMinLhs", VALUEFUNC(_wrap_GenModel_FindConstraintMinLhs), -1);
+  rb_define_method(SwigClassGenModel.klass, "UpdateVariableBoundsMin", VALUEFUNC(_wrap_GenModel_UpdateVariableBoundsMin), -1);
   rb_define_method(SwigClassGenModel.klass, "MakeConstraintFeasible", VALUEFUNC(_wrap_GenModel_MakeConstraintFeasible), -1);
+  rb_define_method(SwigClassGenModel.klass, "MakeAllConstraintFeasible", VALUEFUNC(_wrap_GenModel_MakeAllConstraintFeasible), -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);
@@ -42688,6 +42949,8 @@ SWIGEXPORT void Init_Genmodel(void) {
   rb_define_method(SwigClassGenModel.klass, "dualfeasible", VALUEFUNC(_wrap_GenModel_dualfeasible_get), -1);
   rb_define_method(SwigClassGenModel.klass, "hassolution=", VALUEFUNC(_wrap_GenModel_hassolution_set), -1);
   rb_define_method(SwigClassGenModel.klass, "hassolution", VALUEFUNC(_wrap_GenModel_hassolution_get), -1);
+  rb_define_method(SwigClassGenModel.klass, "hasinfeasibilities=", VALUEFUNC(_wrap_GenModel_hasinfeasibilities_set), -1);
+  rb_define_method(SwigClassGenModel.klass, "hasinfeasibilities", VALUEFUNC(_wrap_GenModel_hasinfeasibilities_get), -1);
   rb_define_method(SwigClassGenModel.klass, "solverdata=", VALUEFUNC(_wrap_GenModel_solverdata_set), -1);
   rb_define_method(SwigClassGenModel.klass, "solverdata", VALUEFUNC(_wrap_GenModel_solverdata_get), -1);
   rb_define_method(SwigClassGenModel.klass, "longParam=", VALUEFUNC(_wrap_GenModel_longParam_set), -1);

data/ext/Genmodel/extconf.rb

@@ -280,6 +280,6 @@ if(is_osi)
     $defs.push("-DOSI_MODULE")
 end
 
-#swig -ruby -o ext/GenModelGem/Genmodel.cpp -c++ src/Genmodel.i
+#swig -ruby -o Genmodel.cpp -c++ ../../src/Genmodel.i
 
 create_makefile (extension_name)

metadata

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