Changeset 1839 for trunk/openopt/scikits/openopt/Kernel/Function.py

Timestamp:

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

Author:

dmitrey.kroshko

Message:

fix for recursive connectOOVars() + some other changes

Files:

• trunk/openopt/scikits/openopt/Kernel/Function.py (modified) (3 diffs)

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