Changeset 2667

Timestamp:

Jun 16, 2010 2:45:58 PM (11 years ago)

Author:

prsteel

Message:

Added empty capabilities dict to 'OptSolver?' base class.

Before, the base class did not define self._capabilities, and so would
throw an error when 'has_capabilities' was called. OptSolver? now
defines an empty self._capabilities container to avoid this.

File:

• coopr.opt/trunk/coopr/opt/base/solver.py (modified) (2 diffs)

coopr.opt/trunk/coopr/opt/base/solver.py

@@ -104 +104 @@
         self.mipgap = None
 
+        # We define no capabilities for the generic solver; base classes must override this
+        self._capabilities = pyutilib.misc.Options()
+
     def has_capability(self, cap):
         """
@@ -116 +119 @@
                              # False otherwise
         """
-        try:
-            # See if self.capabilities has been defined
-            caps = self._capabilities
-        except:
-            raise NotImplementedError, "Generic solver has no capabilities"
-        
         if not isinstance(cap, str):
             raise TypeError, "Expected argument to be of type '%s', not " + \