Changeset 2656

Timestamp:

Jun 11, 2010 10:12:12 AM (11 years ago)

Author:

khunter

Message:

Add readable error message for incorrect arguments to objectives

After spending an egregious amount of time tracking down that we had
passed a model instead of a model attribute (like set). Error
messages to the rescue.

Also add associated test.

Location:

coopr.pyomo/trunk/coopr/pyomo

Files:

• base/constraint.py (modified) (1 diff)
• tests/unit/test_obj.py (modified) (1 diff)

coopr.pyomo/trunk/coopr/pyomo/base/constraint.py

@@ -64 +64 @@
         if args == ():
             self._data[None] = ObjectiveData()
+        else:
+            for i in args:
+                if not ( isinstance(i, _SetContainer) ):
+                    msg  = 'Invalid argument.  Objective expects arguments of '
+                    msg += "type 'Set', not type '%s'" 
+                    raise TypeError, msg % str( type(i).__name__ )
 
         # this is a hack for now; we eventually want a

coopr.pyomo/trunk/coopr/pyomo/tests/unit/test_obj.py

@@ -58 +58 @@
         self.failUnlessEqual(self.instance.obj(), 8)
         self.failUnlessEqual(value(self.instance.obj), 8)
+
+    def test_arguments(self):
+        """Test that arguments notare of type _SetContainer"""
+        def rule(model):
+            return 1
+        try:
+            self.model.obj = Objective(self.model, rule=rule)
+        except TypeError:
+            pass
+        else:
+            self.fail("Objective should only accept '_SetContainter's")
+        
 
     def test_sense_option(self):