genmodel 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9392b2f09d84cc6fa7bf6de12d1af984eb2edb5a
-  data.tar.gz: 7e268105f190b3f7a09514b10fa4c78a2519eedd
+  metadata.gz: 8604a5483901ff08b6f01aa428fa77371b6807fa
+  data.tar.gz: b0d8784902d9ed14df2c3c5a42036408b7ed6235
 SHA512:
-  metadata.gz: 86b3e9a97f0fa20b414781fae46a0a0fb81be36d753407d786171402e91cb2c306845174950a37eeafa4ce1a182d5e82348dede6dc790c7adfdd280b2a6f7509
-  data.tar.gz: 89271f97ad4baf478670aa0a4ef7c5acf8b8af8d8b0ff6d76f0370163a920e0fa061896d72d83a614475b35195d18efa4c04212cbff6c741c99af0615c02b116
+  metadata.gz: 512292feef379a74ba2ebf110d13feda9a547d5a7dc64affbee736a05e06c6a53bdc3d7fbc56f91ac309e9cc14eb086c8463bb6874dd46393cb11c83890e9781
+  data.tar.gz: e72971d8e500b441e73315ba4d8f68d9346e9e06c003b827a361550d45e06084b0d9fc76c70fbd2cd50f2c31c77cd5fc42a2d4ba68e788776eec3f5347696e89

data/ext/Genmodel/GenModel.h

@@ -91,9 +91,9 @@ class GenModel
 public:
 	GenModel();
 	virtual ~GenModel()  { ClearStructure(); };
-	long AddIndexToCoef(string coef, string index);
+	/*long AddIndexToCoef(string coef, string index);
 	long AddCoef(string coef);
-	long CoefIndex(string coef, int nargs, ...);
+	long CoefIndex(string coef, int nargs, ...);*/
 	long AddConst(string cname);
 	long AddConst(string cname, double rhs, char sense);
 	long AddVar(string nn, double o, double l, double u, char t);
@@ -116,6 +116,7 @@ public:
 	long SetBoolParam(string param, bool val);
 	long SetStrParam(string param, string val);
     long ThrowError(string error);
+    static  bool IsAvailable();
 	virtual long Init(string name) = 0;
 	virtual long CreateModel() = 0;
 	virtual long Solve() = 0;

data/ext/Genmodel/GenModelBase.cpp

@@ -13,7 +13,7 @@
 
 GenModel::GenModel()
 {
-    version = "genmodel-0.0.24 build 0001";
+    version = "genmodel-0.0.39 build 0001";
     hassolution = false;
     bcreated = false;
     binit = false;
@@ -22,6 +22,11 @@ GenModel::GenModel()
 	solverdata = NULL;
 }
 
+bool GenModel::IsAvailable()
+{
+    return true;
+}
+
 
 double GenModel::FindConstraintMaxLhs(long row)
 {

data/ext/Genmodel/GenModelCplex.cpp

@@ -19,8 +19,9 @@ GenModelCplex::~GenModelCplex()
     if (solverdata != NULL) delete static_cast<CplexData*>(solverdata);
 }
 
-GenModelCplex::GenModelCplex() {
-    
+bool GenModelCplex::IsAvailable()
+{
+    return true;
 }
 
 long GenModelCplex::WriteProblemToLpFile(string filename)
@@ -714,8 +715,8 @@ long GenModelCplex::Clean()
 #else
 long cpx_not_implemented() { throw string("The Cplex module is not available on this platform"); }
 
-GenModelCplex::GenModelCplex() {cpx_not_implemented();}
 GenModelCplex::~GenModelCplex() {cpx_not_implemented();}
+bool GenModelCplex::IsAvailable() {return false;}
 long GenModelCplex::Init(string name) {return cpx_not_implemented();}
 long GenModelCplex::CreateModel(string filename, int type, string dn) {return cpx_not_implemented();}
 long GenModelCplex::CreateModel() {return cpx_not_implemented();}

data/ext/Genmodel/GenModelCplex.h

@@ -64,9 +64,9 @@ public:
 class GenModelCplex : public GenModel
 {
 public:
-    GenModelCplex();
     ~GenModelCplex();
-	long Init(string name);
+    static bool IsAvailable();
+    long Init(string name);
     long CreateModel(string filename, int type=0, string dn="");
 	long CreateModel();
 	long AddSolverCol(vector<int>& ind, vector<double>& val, double obj, double lb, double ub, string name, char type = 'C');

data/ext/Genmodel/GenModelOsi.cpp

@@ -25,6 +25,11 @@ void printmsg(char* msg, GenModelOsi* p)
         printf("%s", msg);
 }
 
+bool GenModelOsi::IsAvailable()
+{
+    return true;
+}
+
 long GenModelOsi::WriteProblemToLpFile(string filename)
 {
     if(!bcreated)
@@ -854,6 +859,7 @@ long GenModelOsi::Clean()
 
 long osi_not_implemented() { throw string("The Osi module is not available on this platform"); }
 
+bool GenModelOsi::IsAvailable() {return false;}
 long GenModelOsi::Init(string name) {return osi_not_implemented();}
 long GenModelOsi::CreateModel() {return osi_not_implemented();}
 long GenModelOsi::CreateModel(string filename, int type, string dn) {return osi_not_implemented();}

data/ext/Genmodel/GenModelOsi.h

@@ -82,6 +82,7 @@ class GenModelOsi : public GenModel
 {
 public:
 	~GenModelOsi() {if (solverdata != NULL) delete static_cast<OsiData*>(solverdata);}
+    static bool IsAvailable();
 	long Init(string name);//, int type=0);
 	long CreateModel();
     long CreateModel(string filename, int type=0, string dn="");

data/ext/Genmodel/Genmodel.cpp

@@ -2564,10 +2564,8 @@ SWIG_From_ptrdiff_t  (ptrdiff_t value)
     #include "GraphTools.h"
     #include "HyperGraph.h"
     #include "BitVector.h"
-
-
-    std::vector<double> test;
-    vector<double> test1;
+    bool TestCplex(bool mip=true, bool quadratic=false);
+    bool TestOsi(bool mip=true, bool quadratic=false);
 
 
 SWIGINTERNINLINE VALUE
@@ -8401,64 +8399,6 @@ free_swig_Iterator(swig::Iterator *arg1) {
     delete arg1;
 }
 
-SWIGINTERN VALUE
-_wrap_test_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(&test), SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_test_set(VALUE self, VALUE _val) {
-  {
-    void *argp = 0;
-    int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t,  0 );
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""test""' of type '""std::vector< double,std::allocator< double > >""'");
-    }
-    if (!argp) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""test""' of type '""std::vector< double,std::allocator< double > >""'");
-    } else {
-      test = *(reinterpret_cast< std::vector< double,std::allocator< double > > * >(argp));
-    }
-  }
-  return _val;
-fail:
-  return Qnil;
-}
-
-
-SWIGINTERN VALUE
-_wrap_test1_get(VALUE self) {
-  VALUE _val;
-  
-  _val = SWIG_NewPointerObj(SWIG_as_voidptr(&test1), SWIGTYPE_p_vectorT_double_t,  0 );
-  return _val;
-}
-
-
-SWIGINTERN VALUE
-_wrap_test1_set(VALUE self, VALUE _val) {
-  {
-    void *argp = 0;
-    int res = SWIG_ConvertPtr(_val, &argp, SWIGTYPE_p_vectorT_double_t,  0 );
-    if (!SWIG_IsOK(res)) {
-      SWIG_exception_fail(SWIG_ArgError(res), "in variable '""test1""' of type '""vector< double >""'");
-    }
-    if (!argp) {
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in variable '""test1""' of type '""vector< double >""'");
-    } else {
-      test1 = *(reinterpret_cast< vector< double > * >(argp));
-    }
-  }
-  return _val;
-fail:
-  return Qnil;
-}
-
-
 static swig_class SwigClassULongVector;
 
 
@@ -27125,6 +27065,310 @@ free_std_vector_Sl_std_string_Sg_(std::vector< std::string > *arg1) {
     delete arg1;
 }
 
+SWIGINTERN VALUE
+_wrap_TestCplex__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool arg2 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","TestCplex", 1, argv[0] ));
+  } 
+  arg1 = static_cast< bool >(val1);
+  ecode2 = SWIG_AsVal_bool(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TestCplex", 2, argv[1] ));
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      result = (bool)TestCplex(arg1,arg2); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_TestCplex__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","TestCplex", 1, argv[0] ));
+  } 
+  arg1 = static_cast< bool >(val1);
+  {
+    try {
+      result = (bool)TestCplex(arg1); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_TestCplex__SWIG_2(int argc, VALUE *argv, VALUE self) {
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (bool)TestCplex(); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_TestCplex(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[2];
+  int ii;
+  
+  argc = nargs;
+  if (argc > 2) SWIG_fail;
+  for (ii = 0; (ii < argc); ++ii) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_TestCplex__SWIG_2(nargs, args, self);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_TestCplex__SWIG_1(nargs, args, self);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_TestCplex__SWIG_0(nargs, args, self);
+      }
+    }
+  }
+  
+fail:
+  Ruby_Format_OverloadedError( argc, 2, "TestCplex", 
+    "    bool TestCplex(bool mip, bool quadratic)\n"
+    "    bool TestCplex(bool mip)\n"
+    "    bool TestCplex()\n");
+  
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_TestOsi__SWIG_0(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool arg2 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  bool val2 ;
+  int ecode2 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","TestOsi", 1, argv[0] ));
+  } 
+  arg1 = static_cast< bool >(val1);
+  ecode2 = SWIG_AsVal_bool(argv[1], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "bool","TestOsi", 2, argv[1] ));
+  } 
+  arg2 = static_cast< bool >(val2);
+  {
+    try {
+      result = (bool)TestOsi(arg1,arg2); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_TestOsi__SWIG_1(int argc, VALUE *argv, VALUE self) {
+  bool arg1 ;
+  bool val1 ;
+  int ecode1 = 0 ;
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_bool(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "bool","TestOsi", 1, argv[0] ));
+  } 
+  arg1 = static_cast< bool >(val1);
+  {
+    try {
+      result = (bool)TestOsi(arg1); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_TestOsi__SWIG_2(int argc, VALUE *argv, VALUE self) {
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (bool)TestOsi(); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE _wrap_TestOsi(int nargs, VALUE *args, VALUE self) {
+  int argc;
+  VALUE argv[2];
+  int ii;
+  
+  argc = nargs;
+  if (argc > 2) SWIG_fail;
+  for (ii = 0; (ii < argc); ++ii) {
+    argv[ii] = args[ii];
+  }
+  if (argc == 0) {
+    return _wrap_TestOsi__SWIG_2(nargs, args, self);
+  }
+  if (argc == 1) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      return _wrap_TestOsi__SWIG_1(nargs, args, self);
+    }
+  }
+  if (argc == 2) {
+    int _v;
+    {
+      int res = SWIG_AsVal_bool(argv[0], NULL);
+      _v = SWIG_CheckState(res);
+    }
+    if (_v) {
+      {
+        int res = SWIG_AsVal_bool(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        return _wrap_TestOsi__SWIG_0(nargs, args, self);
+      }
+    }
+  }
+  
+fail:
+  Ruby_Format_OverloadedError( argc, 2, "TestOsi", 
+    "    bool TestOsi(bool mip, bool quadratic)\n"
+    "    bool TestOsi(bool mip)\n"
+    "    bool TestOsi()\n");
+  
+  return Qnil;
+}
+
+
 static swig_class SwigClassModVars;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
@@ -28954,173 +29198,6 @@ free_GenModel(GenModel *arg1) {
     delete arg1;
 }
 
-SWIGINTERN VALUE
-_wrap_GenModel_AddIndexToCoef(int argc, VALUE *argv, VALUE self) {
-  GenModel *arg1 = (GenModel *) 0 ;
-  string arg2 ;
-  string arg3 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 0 ;
-  void *argp3 ;
-  int res3 = 0 ;
-  long result;
-  VALUE vresult = Qnil;
-  
-  if ((argc < 2) || (argc > 2)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",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 *","AddIndexToCoef", 1, self )); 
-  }
-  arg1 = reinterpret_cast< GenModel * >(argp1);
-  {
-    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_string,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "string","AddIndexToCoef", 2, argv[0] )); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "string","AddIndexToCoef", 2, argv[0]));
-    } else {
-      arg2 = *(reinterpret_cast< string * >(argp2));
-    }
-  }
-  {
-    res3 = SWIG_ConvertPtr(argv[1], &argp3, SWIGTYPE_p_string,  0 );
-    if (!SWIG_IsOK(res3)) {
-      SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "string","AddIndexToCoef", 3, argv[1] )); 
-    }  
-    if (!argp3) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "string","AddIndexToCoef", 3, argv[1]));
-    } else {
-      arg3 = *(reinterpret_cast< string * >(argp3));
-    }
-  }
-  {
-    try {
-      result = (long)(arg1)->AddIndexToCoef(arg2,arg3); 
-    }
-    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_AddCoef(int argc, VALUE *argv, VALUE self) {
-  GenModel *arg1 = (GenModel *) 0 ;
-  string arg2 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 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 *","AddCoef", 1, self )); 
-  }
-  arg1 = reinterpret_cast< GenModel * >(argp1);
-  {
-    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_string,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "string","AddCoef", 2, argv[0] )); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "string","AddCoef", 2, argv[0]));
-    } else {
-      arg2 = *(reinterpret_cast< string * >(argp2));
-    }
-  }
-  {
-    try {
-      result = (long)(arg1)->AddCoef(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_CoefIndex(int argc, VALUE *argv, VALUE self) {
-  GenModel *arg1 = (GenModel *) 0 ;
-  string arg2 ;
-  int arg3 ;
-  void *arg4 = 0 ;
-  void *argp1 = 0 ;
-  int res1 = 0 ;
-  void *argp2 ;
-  int res2 = 0 ;
-  int val3 ;
-  int ecode3 = 0 ;
-  long result;
-  VALUE vresult = Qnil;
-  
-  if (argc < 2) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",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 *","CoefIndex", 1, self )); 
-  }
-  arg1 = reinterpret_cast< GenModel * >(argp1);
-  {
-    res2 = SWIG_ConvertPtr(argv[0], &argp2, SWIGTYPE_p_string,  0 );
-    if (!SWIG_IsOK(res2)) {
-      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "string","CoefIndex", 2, argv[0] )); 
-    }  
-    if (!argp2) {
-      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "string","CoefIndex", 2, argv[0]));
-    } else {
-      arg2 = *(reinterpret_cast< string * >(argp2));
-    }
-  }
-  ecode3 = SWIG_AsVal_int(argv[1], &val3);
-  if (!SWIG_IsOK(ecode3)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "int","CoefIndex", 3, argv[1] ));
-  } 
-  arg3 = static_cast< int >(val3);
-  {
-    try {
-      result = (long)(arg1)->CoefIndex(arg2,arg3,arg4); 
-    }
-    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_AddConst__SWIG_0(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -30640,6 +30717,32 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_GenModel_IsAvailable(int argc, VALUE *argv, VALUE self) {
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (bool)GenModel::IsAvailable(); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModel_Init(int argc, VALUE *argv, VALUE self) {
   GenModel *arg1 = (GenModel *) 0 ;
@@ -32644,6 +32747,32 @@ free_GenModelCplex(GenModelCplex *arg1) {
     delete arg1;
 }
 
+SWIGINTERN VALUE
+_wrap_GenModelCplex_IsAvailable(int argc, VALUE *argv, VALUE self) {
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (bool)GenModelCplex::IsAvailable(); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModelCplex_Init(int argc, VALUE *argv, VALUE self) {
   GenModelCplex *arg1 = (GenModelCplex *) 0 ;
@@ -34624,6 +34753,32 @@ free_GenModelOsi(GenModelOsi *arg1) {
     delete arg1;
 }
 
+SWIGINTERN VALUE
+_wrap_GenModelOsi_IsAvailable(int argc, VALUE *argv, VALUE self) {
+  bool result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      result = (bool)GenModelOsi::IsAvailable(); 
+    }
+    catch(string str) {
+      SWIG_exception(SWIG_RuntimeError,str.c_str()); 
+    }
+    catch(...) {
+      SWIG_exception(SWIG_RuntimeError,"Unknown exception"); 
+    }
+  }
+  vresult = SWIG_From_bool(static_cast< bool >(result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_GenModelOsi_Init(int argc, VALUE *argv, VALUE self) {
   GenModelOsi *arg1 = (GenModelOsi *) 0 ;
@@ -42472,10 +42627,6 @@ SWIGEXPORT void Init_Genmodel(void) {
   SwigClassIterator.mark = 0;
   SwigClassIterator.destroy = (void (*)(void *)) free_swig_Iterator;
   SwigClassIterator.trackObjects = 0;
-  rb_define_singleton_method(mGenmodel, "test", VALUEFUNC(_wrap_test_get), 0);
-  rb_define_singleton_method(mGenmodel, "test=", VALUEFUNC(_wrap_test_set), 1);
-  rb_define_singleton_method(mGenmodel, "test1", VALUEFUNC(_wrap_test1_get), 0);
-  rb_define_singleton_method(mGenmodel, "test1=", VALUEFUNC(_wrap_test1_set), 1);
   
   SwigClassULongVector.klass = rb_define_class_under(mGenmodel, "ULongVector", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t, (void *) &SwigClassULongVector);
@@ -42805,6 +42956,8 @@ SWIGEXPORT void Init_Genmodel(void) {
   SwigClassStringVector.mark = 0;
   SwigClassStringVector.destroy = (void (*)(void *)) free_std_vector_Sl_std_string_Sg_;
   SwigClassStringVector.trackObjects = 0;
+  rb_define_module_function(mGenmodel, "TestCplex", VALUEFUNC(_wrap_TestCplex), -1);
+  rb_define_module_function(mGenmodel, "TestOsi", VALUEFUNC(_wrap_TestOsi), -1);
   
   SwigClassModVars.klass = rb_define_class_under(mGenmodel, "ModVars", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_ModVars, (void *) &SwigClassModVars);
@@ -42880,9 +43033,6 @@ SWIGEXPORT void Init_Genmodel(void) {
   SwigClassGenModel.klass = rb_define_class_under(mGenmodel, "GenModel", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GenModel, (void *) &SwigClassGenModel);
   rb_undef_alloc_func(SwigClassGenModel.klass);
-  rb_define_method(SwigClassGenModel.klass, "AddIndexToCoef", VALUEFUNC(_wrap_GenModel_AddIndexToCoef), -1);
-  rb_define_method(SwigClassGenModel.klass, "AddCoef", VALUEFUNC(_wrap_GenModel_AddCoef), -1);
-  rb_define_method(SwigClassGenModel.klass, "CoefIndex", VALUEFUNC(_wrap_GenModel_CoefIndex), -1);
   rb_define_method(SwigClassGenModel.klass, "AddConst", VALUEFUNC(_wrap_GenModel_AddConst), -1);
   rb_define_method(SwigClassGenModel.klass, "AddVar", VALUEFUNC(_wrap_GenModel_AddVar), -1);
   rb_define_method(SwigClassGenModel.klass, "AddVars", VALUEFUNC(_wrap_GenModel_AddVars), -1);
@@ -42902,6 +43052,7 @@ SWIGEXPORT void Init_Genmodel(void) {
   rb_define_method(SwigClassGenModel.klass, "SetBoolParam", VALUEFUNC(_wrap_GenModel_SetBoolParam), -1);
   rb_define_method(SwigClassGenModel.klass, "SetStrParam", VALUEFUNC(_wrap_GenModel_SetStrParam), -1);
   rb_define_method(SwigClassGenModel.klass, "ThrowError", VALUEFUNC(_wrap_GenModel_ThrowError), -1);
+  rb_define_singleton_method(SwigClassGenModel.klass, "IsAvailable", VALUEFUNC(_wrap_GenModel_IsAvailable), -1);
   rb_define_method(SwigClassGenModel.klass, "Init", VALUEFUNC(_wrap_GenModel_Init), -1);
   rb_define_method(SwigClassGenModel.klass, "CreateModel", VALUEFUNC(_wrap_GenModel_CreateModel), -1);
   rb_define_method(SwigClassGenModel.klass, "Solve", VALUEFUNC(_wrap_GenModel_Solve), -1);
@@ -42969,6 +43120,7 @@ SWIGEXPORT void Init_Genmodel(void) {
   SWIG_TypeClientData(SWIGTYPE_p_GenModelCplex, (void *) &SwigClassGenModelCplex);
   rb_define_alloc_func(SwigClassGenModelCplex.klass, _wrap_GenModelCplex_allocate);
   rb_define_method(SwigClassGenModelCplex.klass, "initialize", VALUEFUNC(_wrap_new_GenModelCplex), -1);
+  rb_define_singleton_method(SwigClassGenModelCplex.klass, "IsAvailable", VALUEFUNC(_wrap_GenModelCplex_IsAvailable), -1);
   rb_define_method(SwigClassGenModelCplex.klass, "Init", VALUEFUNC(_wrap_GenModelCplex_Init), -1);
   rb_define_method(SwigClassGenModelCplex.klass, "CreateModel", VALUEFUNC(_wrap_GenModelCplex_CreateModel), -1);
   rb_define_method(SwigClassGenModelCplex.klass, "AddSolverCol", VALUEFUNC(_wrap_GenModelCplex_AddSolverCol), -1);
@@ -42997,6 +43149,7 @@ SWIGEXPORT void Init_Genmodel(void) {
   SWIG_TypeClientData(SWIGTYPE_p_GenModelOsi, (void *) &SwigClassGenModelOsi);
   rb_define_alloc_func(SwigClassGenModelOsi.klass, _wrap_GenModelOsi_allocate);
   rb_define_method(SwigClassGenModelOsi.klass, "initialize", VALUEFUNC(_wrap_new_GenModelOsi), -1);
+  rb_define_singleton_method(SwigClassGenModelOsi.klass, "IsAvailable", VALUEFUNC(_wrap_GenModelOsi_IsAvailable), -1);
   rb_define_method(SwigClassGenModelOsi.klass, "Init", VALUEFUNC(_wrap_GenModelOsi_Init), -1);
   rb_define_method(SwigClassGenModelOsi.klass, "CreateModel", VALUEFUNC(_wrap_GenModelOsi_CreateModel), -1);
   rb_define_method(SwigClassGenModelOsi.klass, "AddSolverRow", VALUEFUNC(_wrap_GenModelOsi_AddSolverRow), -1);

data/ext/Genmodel/Test.cpp

@@ -0,0 +1,232 @@
+/***************************************************************************
+ *  Test.cpp
+ *  An application to test GenModel
+ *
+ *  January 8 11:32 2014
+ *  Copyright  2014  Mathieu Bouchard
+ *  mathbouchard@gmail.com
+ ****************************************************************************/
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string>
+#include <vector>
+#include <dlfcn.h>
+#ifdef CPLEX_MODULE
+#include "GenModelCplex.h"
+#endif
+#ifdef OSI_MODULE
+#include "GenModelOsi.h"
+#endif
+using namespace std;
+
+bool TestCplex(bool mip=true, bool quadratic=false)
+{
+#ifdef CPLEX_MODULE
+    try {
+    
+
+    printf("*********** Testing done ***********\n");
+    
+    printf("Solving problem from Integer Programming book p.130\n\n");
+    printf("z = max 4 x1 - 1 x2\n");
+    printf("        7 x1 - 2 x2 <= 14\n");
+    printf("               1 x2 <= 3\n");
+    printf("        2 x1 - 2 x2 <= 3\n\n");
+    printf("The problem has the optimal solution x=(2,1/2) with objective value 7.5\n\n");
+    
+    char version[] = "print_version";
+    char epgap[] = "relative_mip_gap_tolerance";
+    char timelimit[] = "time_limit";
+    char probname[] = "Genmodel Test";
+    char problem_type[] = "mip";
+    char problem_objective[] = "maximize";
+    char log_param[] = "log_file";
+    char log_file[] = "tmp/test.log";
+    char lp_file[] = "tmp/test.lp";
+    char sol_file[] = "tmp/test.sol";
+    char qp_string[] = "qp_mat";
+    char x1[] = "x1";
+    char x2[] = "x2";
+    char c1[] = "c1";
+    char c2[] = "c2";
+    char c3[] = "c3";
+    
+    printf("Initializing problem... ");
+    
+    GenModelCplex solver;
+    printf("done.\n");
+    
+    printf("Setting problem... ");
+    if(mip)
+        solver.SetBoolParam(problem_type, true);
+    if(quadratic)
+        solver.SetBoolParam(qp_string, true);
+    solver.SetBoolParam(version, true);
+    solver.SetBoolParam(problem_objective, true);
+    solver.SetDblParam(timelimit, 120);
+    solver.SetDblParam(epgap, 0.01);
+    solver.SetStrParam(log_param,log_file);
+    solver.AddVar(x1, 4.0, 0.0, numeric_limits<double>::infinity(), (mip ? 'I' : 'C'));
+    if(quadratic)
+        solver.SetQpCoef(0,0,-2.5);
+    solver.AddVar(x2, -1.0, 0.0, numeric_limits<double>::infinity(), 'C');
+    
+    solver.AddConst(c1, 14.0, 'L');
+    solver.AddNzToLast(0, 7.0);
+    solver.AddNzToLast(1, -2.0);
+    
+    solver.AddConst(c2, 3.0, 'L');
+    solver.AddNzToLast(1, 1.0);
+    
+    solver.AddConst(c3, 3.0, 'L');
+    solver.AddNzToLast(0, 2.0);
+    solver.AddNzToLast(1, -2.0);
+    
+    printf("done.\n");
+    printf("Building problem... ");
+    solver.SetNumbers();
+    solver.Init(probname);
+    solver.CreateModel();
+    printf("done.\n");
+    printf("Solving problem... ");
+    solver.Solve();
+    solver.SetSol();
+    printf("done.\n");
+    printf("Retrieving objective value... ");
+    bool has_solution = solver.hassolution;
+    double objective_value = solver.objval;
+    int solution_status = solver.solstat;
+    printf("done.\n");
+    printf("solution_status=%ld\nhas_solution=%d\nobjective_value=%f\n", solution_status, has_solution, objective_value);
+    
+    printf("Writing to lp file... ");
+    solver.WriteProblemToLpFile(lp_file);
+    printf("done.\n");
+    printf("Writing to solution file... ");
+    solver.WriteSolutionToFile(sol_file);
+    printf("done.\n");
+    
+    
+    printf("Solution:\n");
+    for(int i = 0; i < solver.nc; i++)
+        printf("x_%d -> %f [rc = %f]\n", i, solver.vars.sol[i], (mip ? -numeric_limits<double>::infinity() : solver.vars.rc[i]));
+     
+    for(int i = 0; i < 3; i++)
+        printf("c_%d -> %f [slack = %f]\n", i, (mip ? -numeric_limits<double>::infinity() : solver.consts[i].dual), (mip ? -numeric_limits<double>::infinity() : solver.consts[i].slack));
+     
+    } catch (string e) {
+        printf("%s\n",e.c_str());
+    }
+    return true;
+#else
+    printf("Cplex module not available\n");
+    throw string("Cplex module not available");
+    return false;
+#endif
+}
+
+bool TestOsi(bool mip=true, bool quadratic=false)
+{
+#ifdef OSI_MODULE
+    try {
+        printf("*********** Testing done ***********\n");
+        
+        printf("Solving problem from Integer Programming book p.130\n\n");
+        printf("z = max 4 x1 - 1 x2\n");
+        printf("        7 x1 - 2 x2 <= 14\n");
+        printf("               1 x2 <= 3\n");
+        printf("        2 x1 - 2 x2 <= 3\n\n");
+        printf("The problem has the optimal solution x=(2,1/2) with objective value 7.5\n\n");
+        
+        char version[] = "print_version";
+        char epgap[] = "relative_mip_gap_tolerance";
+        char timelimit[] = "time_limit";
+        char probname[] = "Genmodel Test";
+        char problem_type[] = "mip";
+        char problem_objective[] = "maximize";
+        char log_param[] = "log_file";
+        char log_file[] = "tmp/test.log";
+        char lp_file[] = "tmp/test.lp";
+        char sol_file[] = "tmp/test.sol";
+        char qp_string[] = "qp_mat";
+        char x1[] = "x1";
+        char x2[] = "x2";
+        char c1[] = "c1";
+        char c2[] = "c2";
+        char c3[] = "c3";
+        
+        printf("Initializing problem... ");
+        
+        GenModelOsi solver;
+        printf("done.\n");
+        
+        printf("Setting problem... ");
+        if(mip)
+            solver.SetBoolParam(problem_type, true);
+        if(quadratic)
+            solver.SetBoolParam(qp_string, true);
+        solver.SetBoolParam(version, true);
+        solver.SetBoolParam(problem_objective, true);
+        solver.SetDblParam(timelimit, 120);
+        solver.SetDblParam(epgap, 0.01);
+        solver.SetStrParam(log_param,log_file);
+        solver.AddVar(x1, 4.0, 0.0, numeric_limits<double>::infinity(), (mip ? 'I' : 'C'));
+        if(quadratic)
+            solver.SetQpCoef(0,0,-2.5);
+        solver.AddVar(x2, -1.0, 0.0, numeric_limits<double>::infinity(), 'C');
+        
+        solver.AddConst(c1, 14.0, 'L');
+        solver.AddNzToLast(0, 7.0);
+        solver.AddNzToLast(1, -2.0);
+        
+        solver.AddConst(c2, 3.0, 'L');
+        solver.AddNzToLast(1, 1.0);
+        
+        solver.AddConst(c3, 3.0, 'L');
+        solver.AddNzToLast(0, 2.0);
+        solver.AddNzToLast(1, -2.0);
+        
+        printf("done.\n");
+        printf("Building problem... ");
+        solver.SetNumbers();
+        solver.Init(probname);
+        solver.CreateModel();
+        printf("done.\n");
+        printf("Solving problem... ");
+        solver.Solve();
+        solver.SetSol();
+        printf("done.\n");
+        printf("Retrieving objective value... ");
+        bool has_solution = solver.hassolution;
+        double objective_value = solver.objval;
+        int solution_status = solver.solstat;
+        printf("done.\n");
+        printf("solution_status=%ld\nhas_solution=%d\nobjective_value=%f\n", solution_status, has_solution, objective_value);
+        
+        printf("Writing to lp file... ");
+        solver.WriteProblemToLpFile(lp_file);
+        printf("done.\n");
+        printf("Writing to solution file... ");
+        solver.WriteSolutionToFile(sol_file);
+        printf("done.\n");
+        
+        
+        printf("Solution:\n");
+        for(int i = 0; i < solver.nc; i++)
+            printf("x_%d -> %f [rc = %f]\n", i, solver.vars.sol[i], (mip ? -numeric_limits<double>::infinity() : solver.vars.rc[i]));
+        
+        for(int i = 0; i < 3; i++)
+            printf("c_%d -> %f [slack = %f]\n", i, (mip ? -numeric_limits<double>::infinity() : solver.consts[i].dual), (mip ? -numeric_limits<double>::infinity() : solver.consts[i].slack));
+        
+    } catch (string e) {
+        printf("%s\n",e.c_str());
+    }
+    return true;
+#else
+    printf("Osi module not available\n");
+    throw string("Osi module not available");
+    return false;
+#endif
+}

data/ext/Genmodel/extconf.rb

@@ -202,7 +202,7 @@ if is_darwin
     #end
     
 elsif is_linux
-    # path = Dir.home+"/ibm/ILOG/CPLEX_Studio126/cplex/include:/opt/ibm/ILOG/CPLEX_Studio126/cplex/include"
+
     path = "/opt/ibm/ILOG/CPLEX_Studio126/cplex/include"
     puts "Looking for ilcplex/cplex.h in "+path
     if(is_cplex && find_header("ilcplex/cplex.h",path))
@@ -217,6 +217,33 @@ elsif is_linux
         end
     end
     
+    search_path = "/opt/ibm/ILOG/"
+    search_file = "/libcplex.a"
+    puts "Looking for libcplex.a in "+search_path+"/*"
+    file_exist = nil
+    if file_exist == nil && File.exist?(search_path)
+        Find.find(search_path) do |path|
+            if (FileTest.directory?(path))
+                puts path+search_file
+                #temp_name = (path).gsub(/\/usr\/local\/Cellar\/cbc\//,'')
+                #temp_name = (path).gsub(/\/usr\/local\/Cellar\/coinmp\//,'')
+                #count = temp_name.count('/')
+                count = 0
+                if ((count == 0) && (File.exist?(path+search_file)))
+                    file_exist = "#{path}"
+                    break
+                end
+            end
+        end
+    end
+    puts "Looking for libcplex (function CPXopenCPLEX) in "+file_exist
+    if(is_cplex && find_library("cplex","main",file_exist))  #"CPXopenCPLEX",path))
+        puts "found"
+    else
+        puts "not found"
+        is_cplex = false
+    end
+
     path = "/usr/lib:/usr/local/lib/"
     puts "Looking for pthread (function main) in "+path
     if(find_library("pthread",nil,path))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: genmodel
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.39
 platform: ruby
 authors:
 - Mathieu Bouchard
@@ -34,6 +34,7 @@ files:
 - ext/Genmodel/HyperGraph.h
 - ext/Genmodel/ProblemReaderOsi.cpp
 - ext/Genmodel/ProblemReaderOsi.h
+- ext/Genmodel/Test.cpp
 - ext/Genmodel/extconf.rb
 - ext/Genmodel/mygraph.cpp
 - ext/Genmodel/mygraph.h