Changeset 1064

Timestamp:

06/27/08 04:30:10 (4 months ago)

Author:

dmitrey.kroshko

Message:

some chenges

Files:

• trunk/openopt/scikits/openopt/Kernel/ooCheck.py (modified) (1 diff)
• trunk/openopt/scikits/openopt/Kernel/runProbSolver.py (modified) (1 diff)
• trunk/openopt/scikits/openopt/examples/lp_1.py (modified) (2 diffs)

trunk/openopt/scikits/openopt/Kernel/ooCheck.py

@@ -7 +7 @@
-    """
-    nErrors = 0
+
+    if not (p.goal in p.allowedGoals):
+        p.err('goal '+ p.goal+' is not available for the '+ p.probType + ' class (at least not implemented yet)')
+
+
-
-    if p.solver.__constraintsThatCannotBeHandled__ != []:

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

@@ -198 +198 @@
-        if not hasattr(p,  'fk'): p.fk = p.f(p.xk)
-
+    if not hasattr(p, 'fk'): p.fk = p.ff
-    if p.invertObjFunc:  p.fk, p.ff = -p.fk, -p.ff
-

trunk/openopt/scikits/openopt/examples/lp_1.py

@@ -4 +4 @@
-15x1 + 8x2 + 80x3 -> min        (1)
-subjected to
-      
- 
+
+
-8x1  + 80x2 + 15x3 <=150      (4)
-100x1 +  10x2 + x3 >= 800     (5)
- 
+
-x1 + 10x2 + 100x3 = 80           (7)
-x1 >= 4                                     (8)
@@ -21 +21 @@
-Aeq = mat('80 8 15; 1 10 100') # numpy.ndarray is also allowed
-beq = (750, 80)
- 
+
-lb = [4, -80, -inf]
-ub = [inf, -8, inf]
-p = LP(f, A=A, Aeq=Aeq, b=b, beq=beq, lb=lb, ub=ub)
-r = p.solve('cvxopt_lp') # CVXOPT must be installed
-cvxopt_glpk') # CVXOPT
+glpk') # CVXOPT & glpk
-#r = p.solve('lpSolve')#lp_solve must be installed
-print 'objFunValue:', r.ff # should print 204.48841578