Changeset 3145


Ignore:
Timestamp:
Oct 23, 2010 12:21:06 AM (10 years ago)
Author:
jwatson
Message:

Update of PySP baseline output files, due to small numerical differences (4th significant digit) associated with some code mods I recently performed in the course of optimization.

Location:
coopr.pysp/trunk/coopr/pysp/tests/unit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/tests/unit/farmer_linearized.baseline

    r2464 r3145  
    1 
    2 
    31Starting PH
    42Initiating PH iteration=0
     
    6664        Scenarios:
    6765                AboveAverageScenario
    68         Expected node cost=-271788.5596
     66        Expected node cost=-271788.5597
    6967
    7068        Name=AverageNode
     
    8684        Scenarios:
    8785                BelowAverageScenario
    88         Expected node cost=-162923.5732
     86        Expected node cost=-162923.5731
    8987
    9088        Name=RootNode
     
    112110                AboveAverageNode
    113111        Stage=          FirstStage     Cost=111355.5172
    114         Stage=         SecondStage     Cost=-271788.5596
    115         Total scenario cost=-160433.0424
     112        Stage=         SecondStage     Cost=-271788.5597
     113        Total scenario cost=-160433.0425
    116114
    117115        Name=AverageScenario
     
    132130                BelowAverageNode
    133131        Stage=          FirstStage     Cost=111355.5172
    134         Stage=         SecondStage     Cost=-162923.5732
     132        Stage=         SecondStage     Cost=-162923.5731
    135133        Total scenario cost=-51568.0560
    136134
    137135----------------------------------------------------
    138136
    139 Total PH execution time=    1.00 seconds
     137Total PH execution time=    1.88 seconds
    140138
  • coopr.pysp/trunk/coopr/pysp/tests/unit/farmer_linearized_nodedata.baseline

    r2465 r3145  
    1 
    2 
    31Starting PH
    42Initiating PH iteration=0
     
    6664        Scenarios:
    6765                AboveAverageScenario
    68         Expected node cost=-271788.5596
     66        Expected node cost=-271788.5597
    6967
    7068        Name=AverageNode
     
    8684        Scenarios:
    8785                BelowAverageScenario
    88         Expected node cost=-162923.5732
     86        Expected node cost=-162923.5731
    8987
    9088        Name=RootNode
     
    112110                AboveAverageNode
    113111        Stage=          FirstStage     Cost=111355.5172
    114         Stage=         SecondStage     Cost=-271788.5596
    115         Total scenario cost=-160433.0424
     112        Stage=         SecondStage     Cost=-271788.5597
     113        Total scenario cost=-160433.0425
    116114
    117115        Name=AverageScenario
     
    132130                BelowAverageNode
    133131        Stage=          FirstStage     Cost=111355.5172
    134         Stage=         SecondStage     Cost=-162923.5732
     132        Stage=         SecondStage     Cost=-162923.5731
    135133        Total scenario cost=-51568.0560
    136134
    137135----------------------------------------------------
    138136
    139 Total PH execution time=    1.02 seconds
     137Total PH execution time=    1.83 seconds
    140138
  • coopr.pysp/trunk/coopr/pysp/tests/unit/farmer_quadratic.baseline

    r2464 r3145  
    1 
    2 
    31Starting PH
    42Initiating PH iteration=0
     
    119Convergence metric=     36.5075  First stage cost avg= 112963.0247  Max-Min= 2375.31
    1210Initiating PH iteration=4
    13 Convergence metric=     35.4086  First stage cost avg= 112915.6071  Max-Min= 3047.08
     11Convergence metric=     35.4086  First stage cost avg= 112915.6070  Max-Min= 3047.08
    1412Initiating PH iteration=5
    1513Convergence metric=     36.2217  First stage cost avg= 112825.3926  Max-Min= 3339.81
     
    1715Convergence metric=     29.3303  First stage cost avg= 112317.9502  Max-Min= 2019.60
    1816Initiating PH iteration=7
    19 Convergence metric=     21.9702  First stage cost avg= 111364.4660  Max-Min= 1181.85
     17Convergence metric=     21.9702  First stage cost avg= 111364.4659  Max-Min= 1181.85
    2018Initiating PH iteration=8
    21 Convergence metric=     13.8077  First stage cost avg= 110283.4074  Max-Min=  463.23
     19Convergence metric=     13.8077  First stage cost avg= 110283.4073  Max-Min=  463.23
    2220Initiating PH iteration=9
    23 Convergence metric=      9.5141  First stage cost avg= 109399.2542  Max-Min=  363.90
     21Convergence metric=      9.5141  First stage cost avg= 109399.2541  Max-Min=  363.90
    2422Initiating PH iteration=10
    2523Convergence metric=     12.0668  First stage cost avg= 108834.1930  Max-Min=  933.90
     
    2725Convergence metric=     11.6644  First stage cost avg= 108575.3219  Max-Min=  918.57
    2826Initiating PH iteration=12
    29 Convergence metric=      7.5080  First stage cost avg= 108513.5346  Max-Min=  591.25
     27Convergence metric=      7.5080  First stage cost avg= 108513.5347  Max-Min=  591.25
    3028Initiating PH iteration=13
    31 Convergence metric=      3.1070  First stage cost avg= 108528.2898  Max-Min=  175.95
     29Convergence metric=      3.1070  First stage cost avg= 108528.2899  Max-Min=  175.95
    3230Initiating PH iteration=14
    33 Convergence metric=      5.5300  First stage cost avg= 108561.6577  Max-Min=  274.77
     31Convergence metric=      5.5300  First stage cost avg= 108561.6578  Max-Min=  274.77
    3432Initiating PH iteration=15
    35 Convergence metric=      5.4381  First stage cost avg= 108604.0579  Max-Min=  295.14
     33Convergence metric=      5.4381  First stage cost avg= 108604.0580  Max-Min=  295.14
    3634Initiating PH iteration=16
    3735Convergence metric=      3.2812  First stage cost avg= 108667.3583  Max-Min=  127.67
     
    4139Convergence metric=      1.0800  First stage cost avg= 108868.1277  Max-Min=  101.79
    4240Initiating PH iteration=19
    43 Convergence metric=      1.3642  First stage cost avg= 108975.3089  Max-Min=   73.41
     41Convergence metric=      1.3642  First stage cost avg= 108975.3090  Max-Min=   73.41
    4442Initiating PH iteration=20
    4543Convergence metric=      1.5168  First stage cost avg= 109057.4143  Max-Min=   39.47
     
    4745Convergence metric=      1.6833  First stage cost avg= 109099.7144  Max-Min=   87.57
    4846Initiating PH iteration=22
    49 Convergence metric=      1.6446  First stage cost avg= 109099.1239  Max-Min=  104.22
     47Convergence metric=      1.6446  First stage cost avg= 109099.1238  Max-Min=  104.22
    5048Initiating PH iteration=23
    5149Convergence metric=      1.3382  First stage cost avg= 109062.8321  Max-Min=   88.54
     
    6159Convergence metric=      0.8045  First stage cost avg= 108803.9655  Max-Min=   44.57
    6260Initiating PH iteration=29
    63 Convergence metric=      0.8608  First stage cost avg= 108797.7662  Max-Min=   45.24
     61Convergence metric=      0.8608  First stage cost avg= 108797.7661  Max-Min=   45.24
    6462Initiating PH iteration=30
    6563Convergence metric=      0.7643  First stage cost avg= 108809.4793  Max-Min=   39.01
     
    8179Convergence metric=      0.3365  First stage cost avg= 108939.9742  Max-Min=   17.74
    8280Initiating PH iteration=39
    83 Convergence metric=      0.2122  First stage cost avg= 108925.2192  Max-Min=   11.21
     81Convergence metric=      0.2122  First stage cost avg= 108925.2193  Max-Min=   11.21
    8482Initiating PH iteration=40
    8583Convergence metric=      0.0733  First stage cost avg= 108908.7151  Max-Min=    3.89
     
    8785Convergence metric=      0.0547  First stage cost avg= 108893.5090  Max-Min=    2.87
    8886Initiating PH iteration=42
    89 Convergence metric=      0.1522  First stage cost avg= 108881.9217  Max-Min=    8.01
     87Convergence metric=      0.1522  First stage cost avg= 108881.9216  Max-Min=    8.01
    9088Initiating PH iteration=43
    9189Convergence metric=      0.2081  First stage cost avg= 108875.2812  Max-Min=   10.94
    9290Initiating PH iteration=44
    93 Convergence metric=      0.2200  First stage cost avg= 108873.8686  Max-Min=   11.56
     91Convergence metric=      0.2200  First stage cost avg= 108873.8685  Max-Min=   11.56
    9492Initiating PH iteration=45
    9593Convergence metric=      0.1933  First stage cost avg= 108877.0466  Max-Min=   10.15
     
    166164                Cost Variable=FirstStageCost
    167165                        Tree Node=RootNode               (Scenarios:  BelowAverageScenario   AverageScenario   AboveAverageScenario   )
    168                         Values:   108899.8012  108899.8284  108899.8727     Max-Min=      0.0714     Avg= 108899.8341
     166                        Values:   108899.8012  108899.8284  108899.8727     Max-Min=      0.0715     Avg= 108899.8341
    169167Final costs:
    170168Scenario Tree Costs
     
    230228        Stage=          FirstStage     Cost=108899.8727
    231229        Stage=         SecondStage     Cost=-275899.9510
    232         Total scenario cost=-167000.0784
     230        Total scenario cost=-167000.0783
    233231
    234232        Name=AverageScenario
     
    254252----------------------------------------------------
    255253
    256 Total PH execution time=    3.40 seconds
    257 
     254Total PH execution time=    5.90 seconds
     255
Note: See TracChangeset for help on using the changeset viewer.