Changeset 1092

Timestamp:

07/04/08 04:03:55 (2 months ago)

Author:

dmitrey.kroshko

Message:

minor changes

Files:

• trunk/openopt/scikits/openopt/Kernel/BaseProblem.py (modified) (3 diffs)
• trunk/openopt/scikits/openopt/Kernel/ooGraphics.py (modified) (1 diff)

trunk/openopt/scikits/openopt/Kernel/BaseProblem.py

@@ -160 +160 @@
-    def __isFiniteBoxBounded__(self): # TODO: make this function 'lazy'
-        return all(isfinite(self.ub)) and all(isfinite(self.lb))
-
-    def __isUnconstrained__(self):
-        s = ((), [], array([]), None)
-        return self.b.size ==0 and self.beq.size==0 and not self.userProvided.c and not self.userProvided.h \
-            and (self.lb in s or all(isinf(self.lb))) and (self.ub in s or all(isinf(self.ub)))
-
-    def __isNoMoreThanBoxBounded__(self): # TODO: make this function 'lazy'
@@ -237 +232 @@
-        pass
-
+    # TODO: move the function to child classes
+    def __isUnconstrained__(self):
+        s = ((), [], array([]), None)
+        return self.b.size ==0 and self.beq.size==0 and (self.lb in s or all(isinf(self.lb))) and (self.ub in s or all(isinf(self.ub)))
+
+
-class Check:
-    def __init__(self):
@@ -337 +338 @@
-            if not self.solver.__iterfcnConnected__:
-                self.connectIterFcn('df', calledByUser = False)
+
+    # TODO: move the function to child classes
+    def __isUnconstrained__(self):
+        s = ((), [], array([]), None)
+        return self.b.size ==0 and self.beq.size==0 and not self.userProvided.c and not self.userProvided.h \
+            and (self.lb in s or all(isinf(self.lb))) and (self.ub in s or all(isinf(self.ub)))

trunk/openopt/scikits/openopt/Kernel/ooGraphics.py

@@ -83 +83 @@
-            elif p.probType == 'LSP':
-                Y_LABELS = ['sum(residuals^2)']
-            elif p.probType == 'LLSP':
-                p.err('LLSP graphic output is not implemented yet')
-            else:
-                Y_LABELS = ['objFunc(x)']