Changeset 2664

Timestamp:

Jun 16, 2010 10:22:56 AM (11 years ago)

Author:

prsteel

Message:

Overwrote base class behavior for 'has_capability' method in several
derived solver classes.

The base class 'OptSolver?' returns an error when calling
'has_capability'; this behavior needs to be overridden by derived
classes.

Location:

coopr.plugins/trunk/coopr/plugins/mip

Files:

• ASL.py (modified) (2 diffs)
• CBCplugin.py (modified) (1 diff)
• GUROBI.py (modified) (1 diff)
• PICO.py (modified) (2 diffs)

coopr.plugins/trunk/coopr/plugins/mip/ASL.py

@@ -19 +19 @@
 import pyutilib.component.core
 import pyutilib.component.config
+import pyutilib.misc
 import mockmip
 import os
@@ -42 +43 @@
         self._valid_result_formats = {}
         self._valid_result_formats[ProblemFormat.nl] = [ResultsFormat.sol]
+
+        # Note: Undefined capabilities default to 'None'
+        self._capabilities = pyutilib.misc.Options()
+        self._capabilities.linear = True
+        self._capabilities.integer = True
 
     def executable(self):

coopr.plugins/trunk/coopr/plugins/mip/CBCplugin.py

@@ -63 +63 @@
             self._valid_result_formats[ProblemFormat.nl] = [ResultsFormat.sol]        
         self._valid_result_formats[ProblemFormat.mps] = [ResultsFormat.soln]
+
+        # Note: Undefined capabilities default to 'None'
+        self._capabilities = pyutilib.misc.Options()
+        self._capabilities.linear = True
+        self._capabilities.integer = True
 
     def _presolve(self, *args, **kwds):

coopr.plugins/trunk/coopr/plugins/mip/GUROBI.py

@@ -59 +59 @@
         self._valid_result_formats[ProblemFormat.cpxlp] = [ResultsFormat.soln]
         self._valid_result_formats[ProblemFormat.mps] = [ResultsFormat.soln]
+
+        # Note: Undefined capabilities default to 'None'
+        self._capabilities = pyutilib.misc.Options()
+        self._capabilities.linear = True
+        self._capabilities.integer = True
 
     #

coopr.plugins/trunk/coopr/plugins/mip/PICO.py

@@ -18 +18 @@
 import pyutilib.common
 import pyutilib.component.core
+import pyutilib.misc
 import mockmip
 import os
@@ -43 +44 @@
         self._valid_result_formats[ProblemFormat.nl] = [ResultsFormat.sol]
         self._valid_result_formats[ProblemFormat.mps] = [ResultsFormat.soln]
+
+        # Note: Undefined capabilities default to 'None'
+        self._capabilities = pyutilib.misc.Options()
+        self._capabilities.linear = True
+        self._capabilities.integer = True
 
     def executable(self):