Changeset 1519

Timestamp:

10/02/08 03:17:16 (2 months ago)

Author:

dmitrey.kroshko

Message:

init code for oovar

Files:

• trunk/openopt/scikits/openopt/Kernel/BaseProblem.py (modified) (2 diffs)
• trunk/openopt/scikits/openopt/Kernel/Function.py (modified) (5 diffs)
• trunk/openopt/scikits/openopt/Kernel/NLP.py (modified) (1 diff)
• trunk/openopt/scikits/openopt/Kernel/ooVar.py (added)

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

@@ -11 +11 @@
-from ooIterPrint import ooTextOutput
-from ooMisc import setNonLinFincsNumber
+from ooVar import oovar
+from Function import oofun
-
-ProbDefaults = {'diffInt': 1e-7,  'xtol': 1e-6,  'noise': 0}
@@ -334 +336 @@
-            if self.iprint >= -1: self.warn('some non-linear constraints are equal to NaN')
-
+    def __construct_x_from_ooVars__(self):
+        self.oovars = set([])
+        for FuncType in ['f', 'c', 'h']:
+            Funcs = getattr(self, FuncType)
+            if Funcs is None: continue
+            if isinstance(Funcs, oofun):
+                Funcs.__connect_ooVars__(self)
+            else:
+                if type(Funcs) not in [tuple, list]:
+                    self.err('when x0 is absent, oofuns (with oovars) are expected')
+                for fun in Funcs:
+                    if type(Funcs) not in [tuple, list]:
+                        self.err('when x0 is absent, oofuns (with oovars) are expected')
+                    fun.__connect_ooVars__(self)
+        assert len(self.oovars) > 0
+        n = 0
+        for fn in ['x0', 'lb', 'ub']:
+            if not hasattr(self, fn): continue
+            val = getattr(self, fn)
+            if val is not None and any(isfinite(val)):
+                self.err('while using oovars providing x0, lb, ub for whole prob is forbidden, use for each oovar instead')
+
+        x0, lb, ub = [], [], []
+
+        for var in self.oovars:
+            var.__initialize__(self)
+            var.dep = range(n, n+var.size)
+            n += var.size
+            x0.append(var.v0)
+            lb.append(var.lb)
+            ub.append(var.ub)
+        self.n = n
+        self.x0 = x0
+        self.lb = lb
+        self.ub = ub
+
-    def __prepare__(self):
+        # TODO: remove GLP, make other workaround
+        if (not hasattr(self, 'x0') or self.x0 is nan) and self.probType != 'GLP':
+            # hence oovar(s) are used
+            self.__construct_x_from_ooVars__()
+
-        self.x0 = ravel(self.x0)
-        self.__makeCorrectArgs__()

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

@@ -2 +2 @@
-# created by Dmitrey
-#from numpy import copy, isnan, array, argmax, abs, zeros
-
+, array
-from oologfcn import OpenOptException
-from copy import deepcopy
+from ooVar import oovar
-
-class oofun:
@@ -38 +39 @@
-        self.inputTotalLength = 0
-        for item in self.input:
-
-
+
-                item.x = self.x
-                r.append(item())
+            elif isinstance(item, oovar):
+                r.append(self.x[item.dep])
+            elif not callable(item): r.append(item)
-            else:  r.append(item())
-            self.inputTotalLength += r[-1].size
@@ -49 +52 @@
-    def __getDep__(self):
-        if hasattr(self, 'dep'):
-pass
+return self.dep
-        elif self.input is None:
-            self.dep = None
-        else:
-empty(self.x.size, bool
-
+set([]
+#
-            if not type(self.input) in (list, tuple):
-                self.input = [self.input]
-            for oofunInstance in self.input:
-
-
+#
+#
-                tmp = oofunInstance.__getDep__()
-                if tmp is None:
@@ -65 +68 @@
-                    break
-                else:
-
+
+
+
+
+
+
+
-            if r is not None:
-where(r)[0]
+array(list(r))
-        return self.dep
-
@@ -204 +213 @@
-        return r
-
+    def __connect_ooVars__(self, p):
+        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):
+            self.input = [self.input]
+        # p.oovars is set
+
+        for inp in self.input:
+            if isinstance(inp, oovar):
+                p.oovars.add(inp)
+            elif isinstance(inp, oofun):
+                inp.__connect_ooVars__(p) # recursive
+            else: p.err('incorrect input for oofun instance')
+
+
+

trunk/openopt/scikits/openopt/Kernel/NLP.py

@@ -24 +24 @@
-def nlp_init(prob, kwargs):
-
+    prob.goal = 'minimum'
-    f = kwargs['f']
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-