Changeset 1200

Timestamp:

08/05/08 11:47:18 (4 months ago)

Author:

dmitrey.kroshko

Message:

minor changes in Point.py

Files:

• trunk/openopt/scikits/openopt/Kernel/Point.py (modified) (2 diffs)

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

@@ -163 +163 @@
-                if any(self.c() > criticalResidualValue): return False
-
+            mr = self.mr()
+
-            if not self.p.isNaNInConstraintsAllowed:
-                if oldPoint.__nnan__()  > self.__nnan__(): return True
-                elif oldPoint.__nnan__()  < self.__nnan__(): return False
-                # TODO: check me
-self.mr() <= self.p.contol and oldPointResidual <= self.p.contol and self.__nnan__() != 0: return self.mr()
-
-self.mr()
+mr <= self.p.contol and oldPointResidual <= self.p.contol and self.__nnan__() != 0: return mr
+
+mr
-
-            oldPointF_is_NaN = isnan(oldPoint.f())
@@ -181 +183 @@
-            else: # f(oldPoint) is NaN
-                if selfF_is_NaN: # f(newPoint) is NaN
-self.mr()
+mr
-                else: # f(newPoint) is not NaN
-                    return True