Changeset 732

Show
Ignore:
Timestamp:
08/27/10 14:17:43 (1 year ago)
Author:
dmitrey
Message:

some chahges wrt FD getOrder

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • PythonPackages/FuncDesigner/FuncDesigner/examples/sparseSLE.py

    r373 r732  
    44 
    55from FuncDesigner import * 
     6from numpy import arange 
    67from time import time 
    78t = time() 
     
    1112a, b, c = oovar(), oovar(size=n), oovar(size=2*n) 
    1213 
    13 f1 = a + sum(b*range(5, n+5)) 
     14f1 = a + sum(b*arange(5, n+5)) 
    1415f2 = a + 2*b + c.sum()  
    1516f3 = a + a.size + 2*c.size  
  • PythonPackages/FuncDesigner/FuncDesigner/ooFun.py

    r730 r732  
    9595         
    9696        # to prevent creating of several oofuns binded to same oofun.size 
    97         r = oofun(lambda x: asarray(x).size, self, is_linear=True, discrete = True
     97        r = oofun(lambda x: asarray(x).size, self, is_linear=True, discrete = True, getOrder = lambda *args, **kwargs: 0
    9898        self.size = r  
    9999 
     
    133133                    levels.append(elem._level) 
    134134            self._level = max(levels)+1 
     135             
    135136 
    136137    __hash__ = lambda self: self._id 
  • PythonPackages/FuncDesigner/FuncDesigner/ooPoint.py

    r725 r732  
    99from misc import FuncDesignerException 
    1010from numpy import asfarray, ndarray, isscalar 
     11 
     12Len = lambda x: 1 if isscalar(x) else x.size if type(x)==ndarray else len(x) 
    1113 
    1214class ooPoint(dict):