Changeset 1145

Show
Ignore:
Timestamp:
07/18/08 00:25:32 (4 months ago)
Author:
dmitrey.kroshko
Message:

some changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/openopt/README.txt

    r950 r1145  
    1 openopt livense: BSD 
     1openopt license: BSD 
    22 
    33openopt usage: 
     
    55from scikits.openopt import * 
    66 
    7 #and then see  
     7#and then see 
    88help(NLP), help(LP), help(QP) # ... etc 
    99 
    10 See also directory "examples", using on-line documentation is highly recommended:  
     10See also directory "examples", using on-line documentation is highly recommended: 
    1111 
    1212http://scipy.org/scipy/scikits/wiki/OODoc 
     
    2424http://scipy.org/scipy/scikits/wiki/OpenOptUsers 
    2525 
    26 Regards,  
     26Regards, 
    2727OpenOpt developers 
  • trunk/openopt/scikits/openopt/Kernel/BaseProblem.py

    r1128 r1145  
    305305 
    306306    def __prepare__(self): 
     307        self.x0 = ravel(self.x0) 
    307308        self.__makeCorrectArgs__() 
    308309        for s in ('f', 'df', 'd2f', 'c', 'dc', 'd2c', 'h', 'dh', 'd2h'): 
  • trunk/openopt/scikits/openopt/Kernel/LLSP.py

    r1100 r1145  
    2424    def llsp2nlp(self, solver, **kwargs): 
    2525        if hasattr(self,'x0'): p = NLP.NLP(ff, self.x0, df=dff, d2f=d2ff) 
    26         else: p = NLP(ff, zeros(self.n), df=dff, d2f=d2ff) 
     26        else: p = NLP.NLP(ff, zeros(self.n), df=dff, d2f=d2ff) 
    2727        p.args.f = self # DO NOT USE p.args = self IN PROB ASSIGNMENT! 
    2828        self.inspire(p) 
  • trunk/openopt/scikits/openopt/__init__.py

    r1052 r1145  
    55 
    66from oo import LP, NLP, NSP, MILP, QP, NLSP, LSP, GLP, LLSP,  MMP 
    7 from Kernel.Function import _f, _c, _h 
     7from Kernel.Function import oofun 
    88from info import __version__ 
    99#__all__ = filter(lambda s:not s.startswith('_'),dir())