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/wwph-nb.suffixes

    r1859 r2068  
    22
    33# The default should be zero at iterations 0, apart from Gamma
    4 gamma[*,*,Ano1] Iter0FixIfConvergedAtUB 1
    5 gamma[*,*,Ano2] Iter0FixIfConvergedAtUB 1
    6 gamma[*,*,Ano3] Iter0FixIfConvergedAtUB 0
    7 gamma[*,*,Ano4] Iter0FixIfConvergedAtUB 0
     4#gamma[*,*,Ano1] Iter0FixIfConvergedAtUB 0
     5#gamma[*,*,Ano2] Iter0FixIfConvergedAtUB 0
     6#gamma[*,*,Ano3] Iter0FixIfConvergedAtUB 0
     7#gamma[*,*,Ano4] Iter0FixIfConvergedAtUB 0
    88
    9 gamma[*,*,*] Iter0FixIfConvergedAtUB 1
     9gamma[*,*,*] Iter0FixIfConvergedAtUB 0
     10gamma[*,*,*] Iter0FixIfConvergedAtLB 0
     11
     12delta[*,*] Iter0FixIfConvergedAtUB 0
     13delta[*,*] Iter0FixIfConvergedAtLB 0
    1014
    1115# if you want all indices, you can just use the variable name (no [*,*]).
    12 gamma[*,*,*] FixWhenItersConvergedAtLB 8
    13 gamma[*,*,*] FixWhenItersConvergedAtUB 4
     16gamma[*,*,Ano1] FixWhenItersConvergedAtLB 15
     17gamma[*,*,Ano1] FixWhenItersConvergedAtUB 10
     18gamma[*,*,Ano2] FixWhenItersConvergedAtLB 16
     19gamma[*,*,Ano2] FixWhenItersConvergedAtUB 11
     20gamma[*,*,Ano3] FixWhenItersConvergedAtLB 17
     21gamma[*,*,Ano3] FixWhenItersConvergedAtUB 12
    1422
    15 delta[*,*] FixWhenItersConvergedAtLB 10
    16 delta[*,*] FixWhenItersConvergedAtUB 10
     23delta[*,Ano1] FixWhenItersConvergedAtLB 15
     24delta[*,Ano1] FixWhenItersConvergedAtUB 10
     25delta[*,Ano2] FixWhenItersConvergedAtLB 16
     26delta[*,Ano2] FixWhenItersConvergedAtUB 11
     27delta[*,Ano3] FixWhenItersConvergedAtLB 17
     28delta[*,Ano3] FixWhenItersConvergedAtUB 12
    1729
    1830gamma[*,*,*] CanSlamToLB False
    1931gamma[*,*,*] CanSlamToMin False
    2032gamma[*,*,*] CanSlamToAnywhere False
    21 gamma[*,*,*] CanSlamToMax True
    22 gamma[*,*,*] CanSlamToUB True
     33gamma[*,*,*] CanSlamToMax False
     34gamma[*,*,*] CanSlamToUB False
    2335
    2436delta[*,*] CanSlamToLB False
    2537delta[*,*] CanSlamToMin False
    26 delta[*,*] CanSlamToAnywhere True
     38delta[*,*] CanSlamToAnywhere False
    2739delta[*,*] CanSlamToMax False
    2840delta[*,*] CanSlamToUB False
    2941
    3042# higher priority means slam these first
    31 gamma[*,*,Ano1] SlammingPriority 40
    32 gamma[*,*,Ano2] SlammingPriority 30
    33 gamma[*,*,Ano3] SlammingPriority 20
    34 gamma[*,*,Ano4] SlammingPriority 10
    35      
    36 delta[*,*] SlammingPriority 2
    37 
    38 
     43#gamma[*,*,Ano1] SlammingPriority 40
     44#gamma[*,*,Ano2] SlammingPriority 30
     45#gamma[*,*,Ano3] SlammingPriority 20
     46#gamma[*,*,Ano4] SlammingPriority 10
     47#delta[*,*] SlammingPriority 2
Note: See TracChangeset for help on using the changeset viewer.