genmodel 0.0.52 → 0.0.53

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGJjNDU5N2NlNGUxNDUyNTZmOGE1ZTg2NTRiZTZkMWYzYzNkOTE2Yw==
+    MmQwYzYwN2ZiYTJlYzJkN2YxZTdiOTg3NDc4MWJkMWU3YTVmNGI5NQ==
   data.tar.gz: !binary |-
-    YjVkN2I1YWI2MTU4NzgwYjY5ZmM0MTU1MGNiNzc0YTRiYTg2NGU5Nw==
+    YzBkYmYxOTdhNTQ4NjQ1OTg4N2JhZTFkYWU4NGQwMjgzMjU3ZTExYw==
 SHA512:
   metadata.gz: !binary |-
-    OWQ3ZDUzN2QxNjg4MjEzNjMwMWUzZmQ0OTM2NTA0NzUyZWQwNTVlZTMyMjdj
-    OGVhOTdjNmNiYzRhNTg3OWZiODM2ZjM0ZTJlNzQ4Y2NjYTA0YmMxZjEwOWFm
-    ZWFiZTc4MzgzNTkzZDA5MDQyMWZiOGYxNTE1ZmYwY2RlYWE0NjQ=
+    NzAxNDYwZDMzZTAxODM2NWRkY2M1OGRlNmVmYTM4YjQwMjg0OWU3ZDQ1NThk
+    ZWM3YmFhOWQ2ZGY5ODJmNWQ0NTM5ZWEwMWRiOGU1ZTMzZjE0YmIwYjhiZDZi
+    OGI0NWY3MDUzMWE3NGI5NGI3NDc1OWI3MTBhYzBlOTJjYzM4ZjQ=
   data.tar.gz: !binary |-
-    MjkxMDEzOGJlYWQ3OGYzNGFiYzkzNjcxODhkMjkwY2JlNTE2YjI1MjdkNDYw
-    ZjNkYzg2MmM2MGRmZGQyYWU4OWVmZTUzOGY3ZWE4ZWY2NjlmZTI0YjJmODEy
-    ZTAyODM1NDc5NmU2MDhiMzAwNDVmZDMwZTAxMDAwMzJlYThlYmY=
+    ZDg1YWRmOGQwY2JkYWRlZjIxMjcwNjgwMTMzMjQ1YjdjY2JkYjgwZjY4OTIx
+    MjdkMjc0YmExZTNjMTg5MTU4YTQwZWNlYTE1M2RhNjkxYzkwY2I4NDI4YmI1
+    MjA0OTkxYTE3NWFmMDczYzFmMGMxOTVmNTI5YjM1Nzc5N2M4NmQ=

data/ext/Genmodel/GenModel.h

@@ -98,6 +98,7 @@ public:
 	~SolverUnfeasability() {}
 	vector<size_t> get_variable_ids();
 	size_t row_id;
+	string row_name;
 	vector<size_t> variable_ids;
 };
 

data/ext/Genmodel/GenModelBase.cpp

@@ -366,6 +366,7 @@ long GenModel::PrintRowInfo(long row)
 SolverUnfeasability::SolverUnfeasability(size_t _row_id, GenModel* pgm) 
 {
     row_id = _row_id;
+    row_name = pgm->consts[_row_id].name;
     for(size_t i = 0; i < pgm->consts[_row_id].nz; ++i)
     {
         long var_id = pgm->consts[_row_id].cols[i];
@@ -438,7 +439,7 @@ long GenModel::MakeConstraintFeasible(long row)
         {
             if(analyze)
             {
-                if(max  < consts[row].lrhs+1e-7)
+                if(max  < consts[row].lrhs-1e-7)
                     problems.push_back(SolverUnfeasability(row,this));
             }
             else
@@ -458,7 +459,7 @@ long GenModel::MakeConstraintFeasible(long row)
         {
             if(analyze)
             {
-                if(max  < consts[row].lrhs+1e-7)
+                if(max  < consts[row].lrhs-1e-7)
                     problems.push_back(SolverUnfeasability(row,this));
             }
             else

data/ext/Genmodel/Genmodel.cpp

@@ -37948,6 +37948,66 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_SolverUnfeasability_row_name_set(int argc, VALUE *argv, VALUE self) {
+  SolverUnfeasability *arg1 = (SolverUnfeasability *) 0 ;
+  std::string *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  int res2 = SWIG_OLDOBJ ;
+  
+  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_SolverUnfeasability, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "SolverUnfeasability *","row_name", 1, self )); 
+  }
+  arg1 = reinterpret_cast< SolverUnfeasability * >(argp1);
+  {
+    std::string *ptr = (std::string *)0;
+    res2 = SWIG_AsPtr_std_string(argv[0], &ptr);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "std::string const &","row_name", 2, argv[0] )); 
+    }
+    if (!ptr) {
+      SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "std::string const &","row_name", 2, argv[0])); 
+    }
+    arg2 = ptr;
+  }
+  if (arg1) (arg1)->row_name = *arg2;
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+fail:
+  if (SWIG_IsNewObj(res2)) delete arg2;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_wrap_SolverUnfeasability_row_name_get(int argc, VALUE *argv, VALUE self) {
+  SolverUnfeasability *arg1 = (SolverUnfeasability *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::string *result = 0 ;
+  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_SolverUnfeasability, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "SolverUnfeasability *","row_name", 1, self )); 
+  }
+  arg1 = reinterpret_cast< SolverUnfeasability * >(argp1);
+  result = (std::string *) & ((arg1)->row_name);
+  vresult = SWIG_From_std_string(static_cast< std::string >(*result));
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_SolverUnfeasability_variable_ids_set(int argc, VALUE *argv, VALUE self) {
   SolverUnfeasability *arg1 = (SolverUnfeasability *) 0 ;
@@ -54082,6 +54142,8 @@ SWIGEXPORT void Init_Genmodel(void) {
   rb_define_method(SwigClassSolverUnfeasability.klass, "get_variable_ids", VALUEFUNC(_wrap_SolverUnfeasability_get_variable_ids), -1);
   rb_define_method(SwigClassSolverUnfeasability.klass, "row_id=", VALUEFUNC(_wrap_SolverUnfeasability_row_id_set), -1);
   rb_define_method(SwigClassSolverUnfeasability.klass, "row_id", VALUEFUNC(_wrap_SolverUnfeasability_row_id_get), -1);
+  rb_define_method(SwigClassSolverUnfeasability.klass, "row_name=", VALUEFUNC(_wrap_SolverUnfeasability_row_name_set), -1);
+  rb_define_method(SwigClassSolverUnfeasability.klass, "row_name", VALUEFUNC(_wrap_SolverUnfeasability_row_name_get), -1);
   rb_define_method(SwigClassSolverUnfeasability.klass, "variable_ids=", VALUEFUNC(_wrap_SolverUnfeasability_variable_ids_set), -1);
   rb_define_method(SwigClassSolverUnfeasability.klass, "variable_ids", VALUEFUNC(_wrap_SolverUnfeasability_variable_ids_get), -1);
   SwigClassSolverUnfeasability.mark = 0;

metadata

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