Changeset 1839

Timestamp:

12/06/08 03:45:09 (3 years ago)

Author:

dmitrey.kroshko

Message:

fix for recursive connectOOVars() + some other changes

Location:

trunk/openopt/scikits/openopt/Kernel

Files:

• Function.py (modified) (3 diffs)
• GUI.py (modified) (1 diff)
• Point.py (modified) (4 diffs)
• objFunRelated.py (modified) (1 diff)
• ooMisc.py (modified) (1 diff)

trunk/openopt/scikits/openopt/Kernel/Function.py

@@ -12 +12 @@
     input = None # if None then x will be used
     args = ()
+    ooVarsAreAlreadyConnected = False
 
     # finite-difference aproximation step
@@ -302 +303 @@
 
     def __connect_ooVars__(self, p):
+        if self.ooVarsAreAlreadyConnected: return
         if self.input is None: p.err('got oofun w/o connection to oovar (empty input instead). Use x0 or connect oovars.')
         if not type(self.input) in (list, tuple):
@@ -313 +315 @@
                 inp.__connect_ooVars__(p) # recursive
             else: p.err('incorrect input for oofun instance')
+
+        self.ooVarsAreAlreadyConnected = True
 
 

trunk/openopt/scikits/openopt/Kernel/GUI.py

@@ -1 @@
-from Tkinter import Tk, Toplevel, Button, Label, Frame, StringVar, DISABLED, ACTIVE
+# SAGE has some problems with Tkinter
+try:
+    from Tkinter import Tk, Toplevel, Button, Label, Frame, StringVar, DISABLED, ACTIVE
+except:
+    pass
+
 from threading import Thread
 from scikits.openopt import __version__ as ooversion

trunk/openopt/scikits/openopt/Kernel/Point.py

@@ -135 +135 @@
                 beq = p.beq[ind_lin_eq]
                 d += dot(aeq.T, dot(aeq, self.x)  - beq) # 0.5*d/dx((Aeq x - beq)^2)
-            self._all_lin_ineq_gradient = d / self.__all_lin_ineq()
+            devider = self.__all_lin_ineq()
+            if devider != 0:
+                self._all_lin_ineq_gradient = d / devider
+            else:
+                self._all_lin_ineq_gradient = d
         return copy(self._all_lin_ineq_gradient)
 
@@ -206 +210 @@
 #                    ind = ind_max
 
-            if  r < all_lin_ineq:
+            if  r <= all_lin_ineq:
                 self._mr_alt, self._mrName_alt,  self._mrInd_alt = all_lin_ineq, 'all_lin_ineq', 0
             else:
@@ -241 +245 @@
                 if self.p.h(self.x, ind) < 0:  g -= dh#CHECKME!!
                 else: g += dh#CHECKME!!
+            else:
+                # TODO: error or debug warning
+                pass
+                #self.p.err('incorrect resType')
+
             self._dmr, self._dmrName,  self._dmrInd = g, resType, ind
         if retAll:
@@ -260 +269 @@
         if self.p.isUC:
             return self.f() < point2compare.f()
-        else:
+
+        if altLinInEq:
+            mr_field = 'mr_alt'
+        else:
+            mr_field = 'mr'
+        point2compareResidual = getattr(point2compare, mr_field)()
+
+        criticalResidualValue = max((self.p.contol, point2compareResidual))
+
+        if hasattr(self, '_'+mr_field):
+            if getattr(self, '_'+mr_field) > criticalResidualValue: return False
+        else:
+            #TODO: simplify it!
+            #for fn in Residuals: (...)
             if altLinInEq:
-                mr_field = 'mr_alt'
-                point2compareResidual = getattr(point2compare, mr_field)()
-            else:
-                mr_field = 'mr'
-                point2compareResidual = getattr(point2compare, mr_field)()
-
-            criticalResidualValue = max(self.p.contol, point2compareResidual)
-
-            if hasattr(self, '_'+mr_field):
-                if getattr(self, '_'+mr_field) > criticalResidualValue: return False
-            else:
-                #TODO: simplify it!
-                #for fn in Residuals: (...)
-                if altLinInEq:
-                    if self.__all_lin_ineq() > criticalResidualValue: return False
-                else:
-                    if any(self.lb() > criticalResidualValue): return False
-                    if any(self.ub() > criticalResidualValue): return False
-                    if any(self.lin_ineq() > criticalResidualValue): return False
-                    if any(abs(self.lin_eq()) > criticalResidualValue): return False
-                if any(abs(self.h()) > criticalResidualValue): return False
-                if any(self.c() > criticalResidualValue): return False
-
-            mr = getattr(self, mr_field)()
-
-            if not self.p.isNaNInConstraintsAllowed:
-                if point2compare.__nNaNs__()  > self.__nNaNs__(): return True
-                elif point2compare.__nNaNs__()  < self.__nNaNs__(): return False
-                # TODO: check me
-                if mr <= self.p.contol and point2compareResidual <= self.p.contol and self.__nNaNs__() != 0: return mr < point2compareResidual
-
-            if mr < point2compareResidual and self.p.contol < point2compareResidual: return True
-
-            point2compareF_is_NaN = isnan(point2compare.f())
-            selfF_is_NaN = isnan(self.f())
-
-            if not point2compareF_is_NaN: # f(point2compare) is not NaN
-                if not selfF_is_NaN: # f(newPoint) is not NaN
-                    return self.f() < point2compare.f()
-                else: # f(newPoint) is NaN
-                    return False
-            else: # f(point2compare) is NaN
-                if selfF_is_NaN: # f(newPoint) is NaN
-                    return mr < point2compareResidual
-                else: # f(newPoint) is not NaN
-                    return True
+                if self.__all_lin_ineq() > criticalResidualValue: return False
+            else:
+                if any(self.lb() > criticalResidualValue): return False
+                if any(self.ub() > criticalResidualValue): return False
+                if any(self.lin_ineq() > criticalResidualValue): return False
+                if any(abs(self.lin_eq()) > criticalResidualValue): return False
+            if any(abs(self.h()) > criticalResidualValue): return False
+            if any(self.c() > criticalResidualValue): return False
+
+        mr = getattr(self, mr_field)()
+
+        if not self.p.isNaNInConstraintsAllowed:
+            if point2compare.__nNaNs__()  > self.__nNaNs__(): return True
+            elif point2compare.__nNaNs__()  < self.__nNaNs__(): return False
+            # TODO: check me
+            if mr <= self.p.contol and point2compareResidual <= self.p.contol and self.__nNaNs__() != 0: return mr < point2compareResidual
+
+        if mr < point2compareResidual and self.p.contol < point2compareResidual: return True
+
+        point2compareF_is_NaN = isnan(point2compare.f())
+        selfF_is_NaN = isnan(self.f())
+
+        if not point2compareF_is_NaN: # f(point2compare) is not NaN
+            if not selfF_is_NaN: # f(newPoint) is not NaN
+                return self.f() < point2compare.f()
+            else: # f(newPoint) is NaN
+                return False
+        else: # f(point2compare) is NaN
+            if selfF_is_NaN: # f(newPoint) is NaN
+                return mr < point2compareResidual
+            else: # f(newPoint) is not NaN
+                return True
 
     def isFeas(self, **kwargs):

trunk/openopt/scikits/openopt/Kernel/objFunRelated.py

@@ -83 +83 @@
             if len(ind) > 1:
                 # TODO! Don't forget to remove ind[0] and use ind instead
-                p.err("mulpiple index for block problems isn't implemented yet")
+                p.err("multiple index for block problems isn't implemented yet")
 
             #getting number of block and shift

trunk/openopt/scikits/openopt/Kernel/ooMisc.py

@@ -173 +173 @@
 class killThread:
     def __init__(self): pass
-
-