Changeset 437

Show
Ignore:
Timestamp:
02/17/10 14:15:22 (3 weeks ago)
Author:
dmitrey
Message:

some changes wrt individual contol for FD constraints

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • PythonPackages/OpenOpt/openopt/kernel/baseProblem.py

    r433 r437  
    319 319                  
    320 320                 if tol not in (0, probtol, -probtol): 
    321                       f = f * abs(probtol / tol) 
      321                     scaleFactor = abs(probtol / tol) 
      322                     f *= scaleFactor 
      323                     _lb, _ub = _lb * scaleFactor, _ub * scaleFactor 
    322 324                      
    323 325                 if areFixed(dep): 
    324 326                     # TODO: get rid of self.contol, use separate contols for each constraint 
    325                       Contol = c.contol if c.contol != 0 else self.contol 
      327                     Contol = tol if tol != 0 else self.contol 
    326 328                     if not c(self._x0, Contol): 
    327 329                         s = """'constraint "%s" with all-fixed optimization variables it depends on is infeasible in start point,