/[ascend]/trunk/test.py
ViewVC logotype

Diff of /trunk/test.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1504 by jpye, Sun Jun 10 13:49:39 2007 UTC revision 1505 by jpye, Sat Jun 23 14:27:28 2007 UTC
# Line 189  class TestSolver(AscendSelfTester): Line 189  class TestSolver(AscendSelfTester):
189          self._run('distance_calc',filename="distance_calc.a4c")          self._run('distance_calc',filename="distance_calc.a4c")
190    
191      def testconopt(self):      def testconopt(self):
192          self._run('conopttest',"CONOPT",filename="johnpye/conopt/conopttest.a4c")                        self._run('conopttest',"CONOPT",filename="conopttest.a4c")              
193    
194      def testcmslv2(self):      def testcmslv2(self):
195          self._run('testcmslv2',"CMSlv")          self._run('testcmslv2',"CMSlv")
# Line 1406  if __name__=='__main__': Line 1406  if __name__=='__main__':
1406    
1407      freesteamdir = os.path.expanduser("~/freesteam/ascend")      freesteamdir = os.path.expanduser("~/freesteam/ascend")
1408      modeldirs = [os.path.abspath(os.path.join(sys.path[0],"models")),os.path.abspath(freesteamdir)]      modeldirs = [os.path.abspath(os.path.join(sys.path[0],"models")),os.path.abspath(freesteamdir)]
1409        solverdir = os.path.abspath(os.path.join(sys.path[0],"solvers"))
1410        solverdirs = [os.path.join(solverdir,s) for s in "qrslv","cmslv","lrslv","conopt"]
1411      if not os.environ.get('ASCENDLIBRARY'):      if not os.environ.get('ASCENDLIBRARY'):
1412          os.environ['ASCENDLIBRARY'] = SEP.join(modeldirs)          os.environ['ASCENDLIBRARY'] = SEP.join(modeldirs+solverdirs)
1413          restart = 1          restart = 1
1414      else:      else:
1415          envmodelsdir = [os.path.abspath(i) for i in os.environ['ASCENDLIBRARY'].split(SEP)]          envmodelsdir = [os.path.abspath(i) for i in os.environ['ASCENDLIBRARY'].split(SEP)]

Legend:
Removed from v.1504  
changed lines
  Added in v.1505

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22