Ignore:
Timestamp:
Dec 30, 2009 12:43:59 AM (10 years ago)
Author:
wehart
Message:

Merged revisions 1952-2067 via svnmerge from
https://software.sandia.gov/svn/public/coopr/coopr.pysp/trunk

........

r1956 | jwatson | 2009-12-02 17:56:53 -0700 (Wed, 02 Dec 2009) | 3 lines


Added --scenario-solver-options and --ef-solver-options options to the "runph" script.

........

r1957 | dlwoodr | 2009-12-03 14:17:35 -0700 (Thu, 03 Dec 2009) | 2 lines


Documentation updates for pysp

........

r1974 | wehart | 2009-12-06 17:20:56 -0700 (Sun, 06 Dec 2009) | 2 lines


Updating PyPI categories

........

r1978 | jwatson | 2009-12-10 21:29:33 -0700 (Thu, 10 Dec 2009) | 3 lines


Eliminated exception-handling logic when loading user-defined extension modules in PH. The range of exceptions is too large, and for debugging purposes, it is more useful to see the raw trace output.

........

r1979 | jwatson | 2009-12-10 22:23:17 -0700 (Thu, 10 Dec 2009) | 5 lines


Biggest enhancement: The efwriter command-line script now has the option to output a CVaR-weighted objective term. Not extensively tested, but behaves sane on a number of small test cases.


Improved exception handling and error diagnostics in both the runph and efwriter scripts.

........

r1985 | jwatson | 2009-12-12 10:45:17 -0700 (Sat, 12 Dec 2009) | 3 lines


Modified PH to only use warm-starts if a solver has the capability!

........

r1998 | jwatson | 2009-12-13 15:17:58 -0700 (Sun, 13 Dec 2009) | 3 lines


Changed references to _component to active_component.

........

r2026 | wehart | 2009-12-21 23:27:06 -0700 (Mon, 21 Dec 2009) | 2 lines


Attempting to update PH. I'm not sure if this works, since I don't know how to test PH.

........

r2029 | jwatson | 2009-12-22 09:52:21 -0700 (Tue, 22 Dec 2009) | 3 lines


Some fixes to the ef writer based on Bill's recent changes to _initialize_constraint.

........

r2035 | jwatson | 2009-12-22 21:10:32 -0700 (Tue, 22 Dec 2009) | 3 lines


Added --scenario-mipgap option to PH script. Added _mipgap attribute to PH object. This attribute is mirrored to the solver plugin at the initiation of each iteration, after any PH extensions have the opportunity to provide a new value to the attribute. It is currently made use of by the WW PH extension.

........

r2037 | dlwoodr | 2009-12-23 14:38:43 -0700 (Wed, 23 Dec 2009) | 2 lines


add this example from Fernando

........

r2038 | dlwoodr | 2009-12-23 14:46:56 -0700 (Wed, 23 Dec 2009) | 3 lines


finish the job: we can now duplicate Fernando's example

........

r2039 | jwatson | 2009-12-23 15:13:54 -0700 (Wed, 23 Dec 2009) | 3 lines


Missed fix with new constraint initialization syntax in PH linearization.

........

r2058 | jwatson | 2009-12-29 10:57:58 -0700 (Tue, 29 Dec 2009) | 3 lines


Missed some _initialize_constraint function calls within the PySP EF writer during the recent switch to the corresponding "add" method.

........

r2059 | jwatson | 2009-12-29 10:58:34 -0700 (Tue, 29 Dec 2009) | 3 lines


Enabling garbage collection by default in PH.

........

r2060 | jwatson | 2009-12-29 10:59:05 -0700 (Tue, 29 Dec 2009) | 3 lines


Elimnating some debug output.

........

r2061 | jwatson | 2009-12-29 11:07:47 -0700 (Tue, 29 Dec 2009) | 3 lines


Fixing some option documentation in PH.

........

r2062 | jwatson | 2009-12-29 12:00:37 -0700 (Tue, 29 Dec 2009) | 3 lines


Added ef-mipgap option to PH scripts.

........

Location:
coopr.pysp/stable/2.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/stable/2.1

  • coopr.pysp/stable/2.1/examples/pysp/forestry/config/rhosetter.cfg

    r1754 r2068  
    44model_instance = self._model_instance
    55
    6 MyRhoFactor = 0.1
     6MyRhoFactorDelta = 0.001
     7MyRhoFactorGamma = 0.0001
     8MyRhoFactorF = 0.1
     9MyRhoFactorZ = 0.01
    710
    8 for t in model_instance.Times:
     11for t in model_instance.Times[:-1]:
    912
    1013   for h in model_instance.HarvestCells:
    11       self.setRhoAllScenarios( model_instance.delta[h,t], model_instance.P[h,t] * model_instance.A[h] * MyRhoFactor)
     14      self.setRhoAllScenarios( model_instance.delta[h,t] , model_instance.P[h,t] * model_instance.A[h] * MyRhoFactorDelta + MyRhoFactorDelta * model_instance.a[h, t] * model_instance.yr[t] * model_instance.A[h] * sum([ model_instance.Q[o, t] for o in model_instance.COriginNodeForCell[h]]) )
    1215      # .a[h, t] * .A[h] * sum([ model_instance.Q[o, t] for o in model.OriginNodes for h in model.HCellsForOrigin[o]])
     16      # model_instance.a[h, t] * model_instance.A[h] * sum([ model_instance.Q[o, t] for o in model_instance.COriginNodeForCell[h]])
    1317
    1418   for (i,j) in model_instance.PotentialRoads:
    15       self.setRhoAllScenarios( model_instance.gamma[i,j,t], model_instance.C[i,j,t] * MyRhoFactor)
     19      self.setRhoAllScenarios( model_instance.gamma[i,j,t], model_instance.C[i,j,t] * MyRhoFactorGamma)
    1620
    1721   for (i,j) in model_instance.AllRoads:
    18       self.setRhoAllScenarios( model_instance.f[i,j,t], model_instance.D[i,j,t] * MyRhoFactor)
     22      self.setRhoAllScenarios( model_instance.f[i,j,t], model_instance.D[i,j,t] * MyRhoFactorF)
    1923
    2024   for e in model_instance.ExitNodes:
    2125   #for e in model.ExitNodes:
    22       self.setRhoAllScenarios( model_instance.z[e,t],  model_instance.R[e,t] * MyRhoFactor)
     26      self.setRhoAllScenarios( model_instance.z[e,t],  model_instance.R[e,t] * MyRhoFactorZ)
    2327
Note: See TracChangeset for help on using the changeset viewer.