Changeset 1021 for trunk/openopt/scikits/openopt/Kernel/runProbSolver.py

Timestamp:

06/15/08 06:35:08 (4 years ago)

Author:

dmitrey.kroshko

Message:

major changes for ralg, some updates in docstrings, some changes, implementation of prob.point

Files:

• trunk/openopt/scikits/openopt/Kernel/runProbSolver.py (modified) (8 diffs)

trunk/openopt/scikits/openopt/Kernel/runProbSolver.py

@@ -10 +10 @@
 from BaseProblem import ProbDefaults
 from scikits.openopt.Kernel.ooMisc import __solverPaths__
-ConTolMultiplier = 0.9999
+ConTolMultiplier = 0.8
 
 if __solverPaths__ is None:
@@ -23 +23 @@
                 __solverPaths__[file[:-6]] = 'scikits.openopt.solvers.' + string.join(rd,'.') + '.'+file[:-3]
 
-
-def my_import(name):
-    mod = __import__(name)
-    components = name.split('.')
-    for comp in components[1:]:
-        mod = getattr(mod, comp)
-    return mod
-
-class EmptyClass: pass
-class OpenOptResult: pass
 
 def runProbSolver(p_, solver_str, *args, **kwargs):
@@ -128 +118 @@
 
 
-    p.stopdict = dict()
+    p.stopdict = {}
 
     for s in ('f', 'df', 'd2f', 'c', 'dc', 'd2c', 'h', 'dh', 'd2h', 'l', 'dl', 'd2l'):
@@ -136 +126 @@
                 p.nEvals[s] = 0
                 A = getattr(p,s)
+
                 if callable(A): #TODO: add or ndarray(A)!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
                     A = (A,)#make tuple
@@ -205 +196 @@
         if not hasattr(p,  'fk'): p.fk = p.f(p.xk)
 
-    if p.invertObjFunc: p.fk, p.ff = -p.fk, -p.ff
+    if p.invertObjFunc:  p.fk, p.ff = -p.fk, -p.ff
+
     p.ff = p.objFuncMultiple2Single(p.ff)
     #if not hasattr(p, 'xf'): p.xf = p.xk
@@ -215 +207 @@
     p.stopcase = stopcase(p)
 
-
-
-
-
-##    #for more safety
-##    p.ff = p.f(p.xf)
-
     if p.invertObjFunc: p.iterfcn(p.xf, -p.ff)
     else: p.iterfcn(p.xf, p.ff)
@@ -267 +252 @@
     r.evals = p.nEvals
     r.evals['iter'] = p.iter
+
+    p.invertObjFunc = False
 
     if p.iprint < 0:
@@ -293 +280 @@
 
 
+##################################################################
+def my_import(name):
+    mod = __import__(name)
+    components = name.split('.')
+    for comp in components[1:]:
+        mod = getattr(mod, comp)
+    return mod
+
+class EmptyClass: pass
+class OpenOptResult: pass