Merging hotfixes and dev number

Author: sertalpbilal

Diff for: examples/factory_planning_1.py

@@ -1,4 +1,3 @@
-from swat import CAS
 import sasoptpy as so
 import pandas as pd
 

Diff for: examples/food_manufacture_1.py

@@ -1,4 +1,3 @@
-from swat import CAS
 import sasoptpy as so
 import pandas as pd
 

Diff for: examples/food_manufacture_2.py

@@ -1,4 +1,3 @@
-from swat import CAS
 import sasoptpy as so
 import pandas as pd
 
@@ -70,8 +69,8 @@ def test(cas_conn):
     # Additions to the first problem
     isUsed = m.add_variables(OILS, PERIODS, vartype=so.BIN, name='is_used')
     for p in PERIODS:
-        [use[o, p].set_bounds(ub=veg_ub) for o in VEG]
-        [use[o, p].set_bounds(ub=nonveg_ub) for o in NONVEG]
+        use[o, p].set_bounds(ub=veg_ub) for o in VEG
+        use[o, p].set_bounds(ub=nonveg_ub) for o in NONVEG
     m.add_constraints((use[o, p] <= use[o, p]._ub * isUsed[o, p]
                       for o in OILS for p in PERIODS), name='link')
     m.add_constraints((isUsed.sum('*', p) <= max_num_oils_used

Diff for: examples/refinery_optimization.py

@@ -1,4 +1,3 @@
-from swat import CAS
 import sasoptpy as so
 import pandas as pd
 import numpy as np

Diff for: examples/sas_kidney_exchange.py

@@ -1,4 +1,3 @@
-from swat import CAS
 import sasoptpy as so
 import random
 

Diff for: sasoptpy/__init__.py

@@ -29,4 +29,4 @@
 from sasoptpy.components import *
 #  from sasoptpy.gui import start_gui
 
-__version__ = '0.1.0'
+__version__ = '0.1.1.dev0'

Diff for: sasoptpy/components.py

@@ -16,10 +16,10 @@
 #  limitations under the License.
 #
 
-import copy
 from itertools import product
 from math import copysign, inf
 from types import GeneratorType
+import warnings
 
 import numpy as np
 import pandas as pd
@@ -463,7 +463,7 @@ def __init__(self, name, vartype=sasoptpy.methods.CONT, lb=0, ub=inf):
         if vartype == sasoptpy.methods.BIN:
             self._lb = max(self._lb, 0)
             self._ub = min(self._ub, 1)
-        self._linCoef = {name: {'ref': self, 'val': 1.0}}
+        self._linCoef[name] = {'ref': self, 'val': 1.0}
         sasoptpy.methods.register_name(name, self)
         self._cons = set()
         self._key = None
@@ -902,17 +902,22 @@ def __getitem__(self, key):
             indices_to_filter = []
             filter_values = {}
             list_of_variables = []
-            for i, _ in enumerate(key):
-                if key[i] != '*':
+            for i, _ in enumerate(k):
+                if k[i] != '*':
                     indices_to_filter.append(i)
-                    filter_values[i] = sasoptpy.methods._list_item(key[i])
+                    filter_values[i] = sasoptpy.methods._list_item(k[i])
             for v in self._vardict:
                 eligible = True
                 for f in indices_to_filter:
                     if v[f] not in filter_values[f]:
                         eligible = False
                 if eligible:
                     list_of_variables.append(self._vardict[v])
+            if not list_of_variables:
+                warnings.warn('Requested variable group is empty:' +
+                              ' {}[{}] ({})'.
+                              format(self._name, key, type(key)),
+                              RuntimeWarning, stacklevel=2)
             return list_of_variables
 
     def __iter__(self):
@@ -981,7 +986,7 @@ def mult(self, vector):
         Returns
         -------
         :class:`Expression` object
-            An expression that is the product of the variable group with the 
+            An expression that is the product of the variable group with the
             given vector
 
         Examples
@@ -1131,7 +1136,7 @@ class ConstraintGroup:
 
     Notes
     -----
-    Use :func:`sasoptpy.Model.add_constraints` when working with a single 
+    Use :func:`sasoptpy.Model.add_constraints` when working with a single
     model.
 
     See also

Diff for: sasoptpy/model.py

@@ -25,6 +25,7 @@
 from math import inf
 from time import time
 from types import GeneratorType
+import warnings
 
 import pandas as pd
 
@@ -81,6 +82,13 @@ def __init__(self, name, session=None):
         sasoptpy.methods.register_name(name, self)
         print('NOTE: Initialized model {}'.format(name))
 
+    def __eq__(self, other):
+        if not isinstance(other, sasoptpy.Model):
+            warnings.warn('Cannot compare Model object with {}'.
+                          format(type(other)), RuntimeWarning, stacklevel=2)
+            return False
+        return super().__eq__(other)
+
     def add_variable(self, var=None, vartype=sasoptpy.methods.CONT, name=None,
                      lb=0, ub=inf):
         '''
@@ -378,7 +386,7 @@ def include(self, *argv):
 
         Notes
         -----
-        * This function is essentially a wrapper for two functions, 
+        * This function is essentially a wrapper for two functions,
           :func:`sasoptpy.Model.add_variable` and
           :func:`sasoptpy.Model.add_constraint`.
         * Including a model causes all variables and constraints inside the
@@ -914,7 +922,7 @@ def to_frame(self):
                 else:
                     current_row.append(c._name)
                     current_row.append(rhs)
-                    #self._append_row(['', 'RHS', c._name, rhs, '', ''])
+                    # self._append_row(['', 'RHS', c._name, rhs, '', ''])
                     f5 = 0
                     self._append_row(current_row)
         if f5 == 1:

Diff for: setup.py

@@ -22,7 +22,7 @@
 
 setup(
     name='sasoptpy',
-    version='0.1.0',
+    version='0.1.1.dev0',
     packages=['sasoptpy'],
     author='SAS',
     author_email='[email protected]',