Changeset 4062


Ignore:
Timestamp:
05/06/11 20:20:27 (3 years ago)
Author:
wehart
Message:

Reformatting with reindent

Location:
coopr.colin/trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • coopr.colin/trunk/coopr/__init__.py

    r1809 r4062  
    1616    import pkgutil 
    1717    __path__ = pkgutil.extend_path(__path__, __name__) 
    18  
  • coopr.colin/trunk/coopr/colin/__init__.py

    r2201 r4062  
    2222    import pkg_resources 
    2323    # 
    24     # Load modules associated with Plugins that are defined in  
     24    # Load modules associated with Plugins that are defined in 
    2525    # EGG files. 
    2626    # 
     
    2929except: 
    3030    pass 
    31  
  • coopr.colin/trunk/coopr/colin/core/__init__.py

    r2190 r4062  
    1414from problem import * 
    1515import solver 
    16  
  • coopr.colin/trunk/coopr/colin/core/colin_xml_io.py

    r2201 r4062  
    7878            elt.appendChild(text_elt) 
    7979        return doc 
    80  
    81  
  • coopr.colin/trunk/coopr/colin/core/dakota_text_io.py

    r2201 r4062  
    99#  _________________________________________________________________________ 
    1010 
    11 # TODO: pass in variable/function name information into the  
    12 # optimizer.  This will require an augmented point and request  
     11# TODO: pass in variable/function name information into the 
     12# optimizer.  This will require an augmented point and request 
    1313# specification. 
    1414 
     
    9898            print >>OUTPUT, "# ERROR: cannot print Hessian information" 
    9999        OUTPUT.close() 
    100  
  • coopr.colin/trunk/coopr/colin/core/point.py

    r2189 r4062  
    6565                            self.bits.append(0) 
    6666        return self 
    67  
    68          
  • coopr.colin/trunk/coopr/colin/core/problem.py

    r2201 r4062  
    125125            # 
    126126            elif key == "FunctionValue": 
    127                response[key] = self.function_value(point) 
     127                response[key] = self.function_value(point) 
    128128            elif key == "FunctionValues": 
    129                response[key] = self.function_values(point) 
     129                response[key] = self.function_values(point) 
    130130            elif key == "Gradient": 
    131                response[key] = self.gradient(point) 
     131                response[key] = self.gradient(point) 
    132132            elif key == "NonlinearConstraintValues": 
    133                response[key] = self.nonlinear_constraint_values(point) 
     133                response[key] = self.nonlinear_constraint_values(point) 
    134134            elif key == "Jacobian": 
    135                response[key] = self.jacobian(point) 
     135                response[key] = self.jacobian(point) 
    136136            # 
    137137        return response 
     
    156156        self.nint=0 
    157157        self.nbinary=0 
    158          
     158 
    159159    def validate(self, point): 
    160160        if len(point.reals) !=  self.nreal: 
     
    177177                if self.real_upper[i] is not None and self.real_upper[i] < point.reals[i]: 
    178178                    raise ValueError, "Real "+str(i)+" has a value "+str(point.reals[i])+" that is higher than the real upper bound "+str(self.real_upper[i]) 
    179  
    180  
    181          
  • coopr.colin/trunk/coopr/colin/core/solver.py

    r2180 r4062  
    2121        self._valid_result_formats = {} 
    2222        self._valid_result_formats[ProblemFormat.colin_optproblem] = [ResultsFormat.osrl,ResultsFormat.results] 
    23  
  • coopr.colin/trunk/coopr/colin/solver/ps.py

    r4017 r4062  
    8585            # 
    8686            # TODO: add a mechanism to archive the reason for termination 
    87             #     
     87            # 
    8888            if best <= self.min_function_value: 
    8989                tstatus = TerminationCondition.minFunctionValue 
     
    169169        # 
    170170        self.results = results 
    171  
  • coopr.colin/trunk/coopr/colin/tests/core/test_parallel.py

    r3750 r4062  
    9494                self.results[ah.id] = self._my_results[ah.id] 
    9595                return ah 
    96             return coopr.opt.parallel.manager.ActionHandle(error=True, explanation="No queued evaluations available in the 'local' solver manager, which only executes solvers synchronously")  
     96            return coopr.opt.parallel.manager.ActionHandle(error=True, explanation="No queued evaluations available in the 'local' solver manager, which only executes solvers synchronously") 
    9797        elif self._force_error == 1: 
    9898            # 
     
    341341if __name__ == "__main__": 
    342342    unittest.main() 
    343  
  • coopr.colin/trunk/coopr/colin/tests/core/test_problem.py

    r2419 r4062  
    5959        point.reals = [1.0] * 4 
    6060        point.integers = [1.0] * 4 
    61          
     61 
    6262 
    6363if __name__ == "__main__": 
    6464    unittest.main() 
    65  
  • coopr.colin/trunk/coopr/colin/tests/core/test_ps.py

    r3750 r4062  
    104104        except ValueError: 
    105105            pass 
    106          
     106 
    107107 
    108108if __name__ == "__main__": 
    109109    unittest.main() 
    110  
  • coopr.colin/trunk/setup.py

    r3828 r4062  
    2727        pkg_list.append(path) 
    2828    for root, dirs, files in os.walk(path, topdown=True): 
    29       if root in pkg_list and "__init__.py" in files: 
    30          for name in dirs: 
    31            if os.path.exists(root+os.sep+name+os.sep+"__init__.py"): 
    32               pkg_list.append(root+os.sep+name) 
     29        if root in pkg_list and "__init__.py" in files: 
     30            for name in dirs: 
     31                if os.path.exists(root+os.sep+name+os.sep+"__init__.py"): 
     32                    pkg_list.append(root+os.sep+name) 
    3333    return map(lambda x:x.replace(os.sep,"."), pkg_list) 
    3434 
     
    7070      """ 
    7171      ) 
    72  
Note: See TracChangeset for help on using the changeset viewer.