Changeset 723

Timestamp:

08/09/10 22:14:19 (1 year ago)

Author:

dmitrey

Message:

some FD changes

Files:

• PythonPackages/FuncDesigner/FuncDesigner/ooFun.py (modified) (2 diffs)
• PythonPackages/FuncDesigner/FuncDesigner/ooPoint.py (modified) (1 diff)
• PythonPackages/FuncDesigner/FuncDesigner/ooVar.py (modified) (1 diff)

PythonPackages/FuncDesigner/FuncDesigner/ooFun.py

@@ -527 +527 @@
-            if type(args[0]) != str:
-                assert not isinstance(args[0], oofun), "you can't invoke oofun on another one oofun"
+                
+                if self.is_oovar:
+                    if isinstance(x, dict):
+                        tmp = x.get(self, None)
+                        if tmp is not None:
+                            return tmp #if type(tmp)==ndarray else asfarray(tmp)
+                        elif self.name in x:
+                            return asfarray(x[self.name])
+                        else:
+                            s = 'for oovar ' + self.name + \
+                            " the point involved doesn't contain neither name nor the oovar instance. Maybe you try to get function value or derivative in a point where value for an oovar is missing"
+                            raise FuncDesignerException(s)
+                    elif hasattr(x, 'xf'):
+                        # TODO: possibility of squeezing
+                        return x.xf[self]
+                    else:
+                        raise FuncDesignerException('Incorrect data type (%s) while obtaining oovar %s value' %(type(x), self.name))
+            
-            else:
-                self.name = args[0]
@@ -538 +556 @@
-
-    def _getFuncCalcEngine(self, *args, **kwargs):
+        x = args[0]
+        
-        dep = self._getDep()
-x = args[0]
+
-        CondSamePointByID = True if type(x) == ooPoint and self._point_id == x._id else False
-

PythonPackages/FuncDesigner/FuncDesigner/ooPoint.py

@@ -22 +22 @@
-        dict.__init__(self, items)
-        
+        for key, val in items:
+            if 'size' in key.__dict__ and type(key.size) == int and Len(val)  != key.size: 
+                s = 'incorrect size for oovar %s: %d is required, %d is obtained' % (self.name, self.size, Size)
+                raise FuncDesignerException(s)
+
+        
-        ooPoint._id += 1
-        self._id = ooPoint._id

PythonPackages/FuncDesigner/FuncDesigner/ooVar.py

@@ -23 +23 @@
-        
-    def _getFuncCalcEngine(self, x, **kwargs):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-        
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-#    def _initialize(self, p):