Changeset 5786


Ignore:
Timestamp:
May 18, 2012 12:00:26 AM (7 years ago)
Author:
jwatson
Message:

Adding darwin CPLEX baselines for PySP.

Location:
coopr.pysp/trunk/coopr/pysp/tests/unit
Files:
10 added
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/tests/unit/test_ph.py

    r5740 r5786  
    717717        pyutilib.misc.reset_redirect()
    718718        self.cleanup()
    719         self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out",this_test_file_directory+"networkflow1ef10_quadratic_cplex.baseline", filter=filter_time_and_data_dirs)
     719
     720        if os.sys.platform == "darwin":
     721            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out",this_test_file_directory+"networkflow1ef10_quadratic_cplex_darwin.baseline", filter=filter_time_and_data_dirs)
     722        else:
     723            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_cplex.out",this_test_file_directory+"networkflow1ef10_quadratic_cplex.baseline", filter=filter_time_and_data_dirs)
    720724
    721725    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    736740        pyutilib.misc.reset_redirect()
    737741        self.cleanup()
     742
    738743        if os.sys.platform == "darwin":
    739744            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_quadratic_gurobi.out",this_test_file_directory+"networkflow1ef10_quadratic_gurobi_darwin.baseline", filter=filter_time_and_data_dirs)
     
    758763        pyutilib.misc.reset_redirect()
    759764        self.cleanup()
    760         self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_linearized_cplex.out",this_test_file_directory+"networkflow1ef10_linearized_cplex.baseline", filter=filter_time_and_data_dirs)
     765
     766        if os.sys.platform == "darwin":
     767            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_linearized_cplex.out",this_test_file_directory+"networkflow1ef10_linearized_cplex_darwin.baseline", filter=filter_time_and_data_dirs)
     768        else:
     769            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_linearized_cplex.out",this_test_file_directory+"networkflow1ef10_linearized_cplex.baseline", filter=filter_time_and_data_dirs)
    761770
    762771    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    804813        self.cleanup()
    805814
    806         self.assertFileEqualsBaseline(this_test_file_directory+"forestry_linearized_cplex.out",this_test_file_directory+"forestry_linearized_cplex.baseline", filter=filter_time_and_data_dirs)           
     815        if os.sys.platform == "darwin":
     816            self.assertFileEqualsBaseline(this_test_file_directory+"forestry_linearized_cplex.out",this_test_file_directory+"forestry_linearized_cplex_darwin.baseline", filter=filter_time_and_data_dirs)           
     817        else:
     818            self.assertFileEqualsBaseline(this_test_file_directory+"forestry_linearized_cplex.out",this_test_file_directory+"forestry_linearized_cplex.baseline", filter=filter_time_and_data_dirs)           
    807819
    808820    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    10261038        pyutilib.misc.reset_redirect()
    10271039        self.cleanup()
    1028         self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex.baseline", filter=filter_time_and_data_dirs)               
     1040
     1041        if os.sys.platform == "darwin":
     1042            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex_darwin.baseline", filter=filter_time_and_data_dirs)               
     1043        else:
     1044            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_ef_with_solve_cplex.out",this_test_file_directory+"sizes3_ef_with_solve_cplex.baseline", filter=filter_time_and_data_dirs)               
    10291045
    10301046    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    12451261        os.system(argstring)       
    12461262        self.cleanup()
    1247         self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out",this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.baseline", filter=filter_pyro)
     1263
     1264        if os.sys.platform == "darwin":
     1265            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out",this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)
     1266        else:
     1267            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.out",this_test_file_directory+"sizes3_quadratic_cplex_with_phpyro.baseline", filter=filter_pyro)
    12481268
    12491269    @unittest.skipIf(not cplex_available or not mpirun_available, "Either the 'cplex' executable is not available or the 'mpirun' executable is not available")
     
    12661286        os.system(argstring)       
    12671287        self.cleanup()
    1268         self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out",this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)       
     1288
     1289        if os.sys.platform == "darwin":
     1290            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out",this_test_file_directory+"sizes3_linearized_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)       
     1291        else:
     1292            self.assertFileEqualsBaseline(this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.out",this_test_file_directory+"sizes3_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)       
    12691293
    12701294    @unittest.skipIf(not gurobi_available or not mpirun_available, "Either the 'gurobi' executable is not available or the 'mpirun' executable is not available")
     
    14121436        self.cleanup()
    14131437
    1414         self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro.baseline", filter=filter_pyro)
     1438        if os.sys.platform == "darwin":
     1439            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)
     1440        else:
     1441            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_quadratic_cplex_with_phpyro.baseline", filter=filter_pyro)
    14151442
    14161443    @unittest.skipIf(not gurobi_available, "The 'gurobi' executable is not available")
     
    14571484        self.cleanup()
    14581485
    1459         self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
     1486        if os.sys.platform == "darwin":
     1487            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)   
     1488        else:
     1489            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef3_simple_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
    14601490           
    14611491
     
    15001530        self.cleanup()
    15011531
    1502         self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
     1532        if os.sys.platform == "darwin":
     1533            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro_darwin.baseline", filter=filter_pyro)
     1534        else:
     1535            self.assertFileEqualsBaseline(this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.out",this_test_file_directory+"networkflow1ef10_advanced_linearized_cplex_with_phpyro.baseline", filter=filter_pyro)
    15031536
    15041537    @unittest.skipIf(not cplex_available, "The 'cplex' executable is not available")
Note: See TracChangeset for help on using the changeset viewer.