Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Agnostic #402

Draft
wants to merge 176 commits into
base: main
Choose a base branch
from
Draft

[WIP] Agnostic #402

wants to merge 176 commits into from

Commits on Dec 19, 2022

  1. add some notes about agnostic

    @DLWoodruff
    DLWoodruff committed Dec 19, 2022
    Configuration menu
    Copy the full SHA
    f943763 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2023

  1. minor edits to txt file

    @DLWoodruff
    DLWoodruff committed Jan 7, 2023
    Configuration menu
    Copy the full SHA
    7ac63b3 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    62ff84e View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. just getting started; more questions than answers

    @DLWoodruff
    DLWoodruff committed Aug 24, 2023
    Configuration menu
    Copy the full SHA
    191027d View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. [WIP] scenario creator for agnostic object is roughed in but totally … 

    …untested
    @DLWoodruff
    DLWoodruff committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    6ef0c0b View commit details
    Browse the repository at this point in the history

  2. starting to make agnostic work

    @DLWoodruff
    DLWoodruff committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    43fe36c View commit details
    Browse the repository at this point in the history

  3. scenario creation executes

    @DLWoodruff
    DLWoodruff committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    537e3ba View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. starting to modify phbase for agnostic

    @DLWoodruff
    DLWoodruff committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    4423e00 View commit details
    Browse the repository at this point in the history

  2. a bash script to be deleted later

    @DLWoodruff
    DLWoodruff committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    ea5f306 View commit details
    Browse the repository at this point in the history

  3. WIP; early work on ph callback; starting attach to obj

    @DLWoodruff
    DLWoodruff committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    3fcf43d View commit details
    Browse the repository at this point in the history

  4. WIP; still working on attach_PH_to_objective (need xbars)

    @DLWoodruff
    DLWoodruff committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    159d6e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2023

  1. ready to start work on solve_one

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    1dd7c46 View commit details
    Browse the repository at this point in the history

  2. starting on solve_one

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    bfca106 View commit details
    Browse the repository at this point in the history

  3. solve_one executes; need to debug _reenable_W

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    1d4b156 View commit details
    Browse the repository at this point in the history

  4. PH is executing; need to write a solution and start working on spokes

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    440156b View commit details
    Browse the repository at this point in the history

  5. move the example to the examples dir

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    8c0e510 View commit details
    Browse the repository at this point in the history

  6. ready to try xhatter

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    06754dc View commit details
    Browse the repository at this point in the history

  7. xhatshuffle seems to be working

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    c24c3be View commit details
    Browse the repository at this point in the history

  8. WIP: debugging W's in lagrangian

    @DLWoodruff
    DLWoodruff committed Aug 27, 2023
    Configuration menu
    Copy the full SHA
    6492b8f View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. debugging output

    @DLWoodruff
    DLWoodruff committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    23e41c1 View commit details
    Browse the repository at this point in the history

  2. the ampl version of farmer (stochastic)

    @DLWoodruff
    DLWoodruff committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    64efddb View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. single scenario farmer works

    @DLWoodruff
    DLWoodruff committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1ebdba4 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. examples of amplpy from AMPL

    @DLWoodruff
    DLWoodruff committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    3b88743 View commit details
    Browse the repository at this point in the history

  2. lshaped did not yet have the uniform probabiity option

    @DLWoodruff
    DLWoodruff committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    26bd8bf View commit details
    Browse the repository at this point in the history

  3. draft of ampl create scenario written

    @DLWoodruff
    DLWoodruff committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    370fba9 View commit details
    Browse the repository at this point in the history

  4. [WIP] almost done with draft of AMPL agnostic; one copy function left

    @DLWoodruff
    DLWoodruff committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    c94cccc View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. w_ and prox_ disabled do not need a callout

    @DLWoodruff
    DLWoodruff committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    2ae66d7 View commit details
    Browse the repository at this point in the history

  2. farmer_ampl_agnostic.py is sort of done, but totally untested

    @DLWoodruff
    DLWoodruff committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    c4ea3c4 View commit details
    Browse the repository at this point in the history

  3. [WIP] working on solving

    @DLWoodruff
    DLWoodruff committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    c1d8c7e View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. solve executes; now we need actual scenarios

    @DLWoodruff
    DLWoodruff committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    a7ec164 View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2023

  1. The ampl guest module seems to be working

    @DLWoodruff
    DLWoodruff committed Sep 2, 2023
    Configuration menu
    Copy the full SHA
    0f2f17e View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. reoranize files

    @DLWoodruff
    DLWoodruff committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    e715e1a View commit details
    Browse the repository at this point in the history

  2. try to create a simple test

    @DLWoodruff
    DLWoodruff committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    fb7f4c3 View commit details
    Browse the repository at this point in the history

  3. have the ampl farmer in the test dir for now; a few months from now, … 

    …it should not be here
    @DLWoodruff
    DLWoodruff committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    76d41ad View commit details
    Browse the repository at this point in the history

  4. decent tests added; the ampl example does not yet copy W values corre… 

    …ctly
    @DLWoodruff
    DLWoodruff committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    a076f12 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2023

  1. attach a better obj; but still doesn't seem to work right

    @DLWoodruff
    DLWoodruff committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    b612e45 View commit details
    Browse the repository at this point in the history

  2. correct errors in objective function for PH

    @DLWoodruff
    DLWoodruff committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    8878ab8 View commit details
    Browse the repository at this point in the history

  3. drop a debugging print statement

    @DLWoodruff
    DLWoodruff committed Sep 5, 2023
    Configuration menu
    Copy the full SHA
    e396e0a View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. not cool, but we have farmer.mod in two places

    @DLWoodruff
    DLWoodruff committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    5efca81 View commit details
    Browse the repository at this point in the history

  2. ampl is almost working with PH, but is returning the wrong the object… 

    …ive to the PH algorithm so the test fails (even though everything else works)
    @DLWoodruff
    DLWoodruff committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    1bf1e0b View commit details
    Browse the repository at this point in the history

  3. giving up on getting data processing related to objs in the hub to ma… 

    …tch Pyoom (doesn't really matter, but is troubling)
    @DLWoodruff
    DLWoodruff committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    d408982 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. during merge from main, deal with bundling and persistent solvers; co… 

    …uld be checked again...!
    @DLWoodruff
    DLWoodruff committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    0450a6f View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. merge from main

    @DLWoodruff
    DLWoodruff committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    3b3472c View commit details
    Browse the repository at this point in the history

  2. finish merge

    @DLWoodruff
    DLWoodruff committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    5cbd94e View commit details
    Browse the repository at this point in the history

  3. single scenario farmer for GAMS

    @DLWoodruff
    DLWoodruff committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    acf8119 View commit details
    Browse the repository at this point in the history

  4. adding basic GAMS example

    @bknueven
    bknueven committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    cd5f701 View commit details
    Browse the repository at this point in the history

  5. no gamspy

    @bknueven
    bknueven committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    2424686 View commit details
    Browse the repository at this point in the history

  6. some installation instructions for AMPL

    @DLWoodruff
    DLWoodruff committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    d7f9aea View commit details
    Browse the repository at this point in the history

  7. update asl instructions

    @DLWoodruff
    DLWoodruff committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    68620aa View commit details
    Browse the repository at this point in the history

  8. with padding

    @bknueven
    bknueven committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a9bad1c View commit details
    Browse the repository at this point in the history

  9. better GAMS installation instructions

    @bknueven
    bknueven committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    250850a View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. adding seemingly working modifications

    @bknueven
    bknueven committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    211a866 View commit details
    Browse the repository at this point in the history

  2. modifying records

    @bknueven
    bknueven committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    51af113 View commit details
    Browse the repository at this point in the history

  3. really working

    @bknueven
    bknueven committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    ca40b86 View commit details
    Browse the repository at this point in the history

  4. quasi-working gams

    @bknueven
    bknueven committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    4b31cc7 View commit details
    Browse the repository at this point in the history

  5. adding farmer_gams_agnostic

    @bknueven
    bknueven committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    741b674 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2023

  1. now giving a rho a value in ampl and gams guests

    @DLWoodruff
    DLWoodruff committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    7b068cd View commit details
    Browse the repository at this point in the history

  2. [WIP] working on copying xbars and rho (ampl and gams are just pasted… 

    … from pyomo at the moment); nothing has been run
    @DLWoodruff
    DLWoodruff committed Nov 27, 2023
    Configuration menu
    Copy the full SHA
    82a2a4b View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2023

  1. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    aa03985 View commit details
    Browse the repository at this point in the history

  2. [WIP] adding rho and xbar to the things that need to come from the ho… 

    …st before solve_one
    @DLWoodruff
    DLWoodruff committed Nov 29, 2023
    Configuration menu
    Copy the full SHA
    96f6a4f View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. [WIP] Pyomo as a guest seems to be getting xbar, W, and rho; AMPL exe… 

    …cutes but does not get good results
    @DLWoodruff
    DLWoodruff committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    a591c3d View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. [WIP] AMPL does not match Pyomo at iter 2 (after iter 1)

    @DLWoodruff
    DLWoodruff committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    bccc513 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. GAMS now tries to copy W xbar and rho before solve; gams executes, bu… 

    …t not correctly
    @DLWoodruff
    DLWoodruff committed Dec 14, 2023
    Configuration menu
    Copy the full SHA
    2cf5a66 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2023

  1. GAMS is at a roadblock: non-determinstic trouble loading the solution… 

    …, see gams_debug.txt
    @DLWoodruff
    DLWoodruff committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    d64336e View commit details
    Browse the repository at this point in the history

  2. AMPL now matches Pyomo

    @DLWoodruff
    DLWoodruff committed Dec 16, 2023
    Configuration menu
    Copy the full SHA
    f51678f View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2023

  1. Linearized prox term for gams farmer

    @DLWoodruff
    DLWoodruff committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    1baa4d5 View commit details
    Browse the repository at this point in the history

  2. at least the iter zero solves do not fail!

    @DLWoodruff
    DLWoodruff committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    032ed2c View commit details
    Browse the repository at this point in the history

  3. cleanup and comments for ampl

    @DLWoodruff
    DLWoodruff committed Dec 28, 2023
    Configuration menu
    Copy the full SHA
    aceac81 View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2023

  1. The last commit message was misleading: some levels are somehow bad e… 

    …ven though the solve is good; farmer_linear_augmented.py now illustrates (without Pyomo or mpisppy)
    @DLWoodruff
    DLWoodruff committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    0f3a777 View commit details
    Browse the repository at this point in the history

  2. added sync_db to debug code; ready to make it work for mpisppy

    @DLWoodruff
    DLWoodruff committed Dec 29, 2023
    Configuration menu
    Copy the full SHA
    de715b4 View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Now iter 0 really works, but iter 1 solves fail (with linearized prox… 

    …); this is progress
    @DLWoodruff
    DLWoodruff committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    fcd6e28 View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2023

  1. farmer_linear_augmented.py and farmer_line_augmented.gms show the bad… 

    … solver status using GAMS only
    @DLWoodruff
    DLWoodruff committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    879d885 View commit details
    Browse the repository at this point in the history

  2. gams linear is working with PH; bounds are not working yet; not sure … 

    …about quadratic
    @DLWoodruff
    DLWoodruff committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    4230b31 View commit details
    Browse the repository at this point in the history

  3. gams linearized seems to work for hub and one other cylinder, but not… 

    … three cylinders; quadratic works for only PH; when it doesn't work there seems be a file contention problem
    @DLWoodruff
    DLWoodruff committed Dec 31, 2023
    Configuration menu
    Copy the full SHA
    1c04d6b View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. update notes

    @DLWoodruff
    DLWoodruff committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    bdc863c View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. add serial PH example

    @bknueven
    bknueven committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    bbb4b85 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. barely starting work on general agnostic with pyomo as guest

    @DLWoodruff
    DLWoodruff committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    3cfcda9 View commit details
    Browse the repository at this point in the history

  2. [WIP] working on pyomo.py for agnostic

    @DLWoodruff
    DLWoodruff committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7e071be View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2024

  1. [WIP] done with my first pass at the general Pyomo; ready to develop … 

    …a test model file
    @DLWoodruff
    DLWoodruff committed Apr 29, 2024
    Configuration menu
    Copy the full SHA
    aa6fd8a View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. [WIP] working on agnostic general cylinders; --help executes

    @DLWoodruff
    DLWoodruff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    de71dec View commit details
    Browse the repository at this point in the history

  2. move agnostic.py from utils to agnostic

    @DLWoodruff
    DLWoodruff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    37d253b View commit details
    Browse the repository at this point in the history

  3. [WIP] about to support a class instead of a module in agnostic.py

    @DLWoodruff
    DLWoodruff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    8bf335b View commit details
    Browse the repository at this point in the history

  4. update example

    @DLWoodruff
    DLWoodruff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    7d09b5a View commit details
    Browse the repository at this point in the history

  5. [WIP] able to execute object creation

    @DLWoodruff
    DLWoodruff committed May 1, 2024
    Configuration menu
    Copy the full SHA
    179a844 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. ready to test pyomo as guest

    @DLWoodruff
    DLWoodruff committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    75706e6 View commit details
    Browse the repository at this point in the history

  2. agnostic for general pyomo as guest seems to execute

    @DLWoodruff
    DLWoodruff committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    8a34323 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Just getting started with generic AMPL

    @DLWoodruff
    DLWoodruff committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4678ebc View commit details
    Browse the repository at this point in the history

  2. a rough version of generic ampl needs a lot of work to make it go

    @DLWoodruff
    DLWoodruff committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    dde7e96 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. ampl is starting to run, but still needs work

    @DLWoodruff
    DLWoodruff committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    3c7d974 View commit details
    Browse the repository at this point in the history

  2. Just started working on callbacks for generic AMPL

    @DLWoodruff
    DLWoodruff committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    601ab69 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2024

  1. ready to work on attach PH

    @DLWoodruff
    DLWoodruff committed Jun 8, 2024
    Configuration menu
    Copy the full SHA
    bfad1dc View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. generic, agnostic farmer is starting to run, but solve_one still need… 

    …s work
    @DLWoodruff
    DLWoodruff committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    9747e0c View commit details
    Browse the repository at this point in the history

  2. generic, agnostic ampl seems to be working at least for a hub; have n… 

    …ot yet tried cylinders
    @DLWoodruff
    DLWoodruff committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    a161c7a View commit details
    Browse the repository at this point in the history

  3. set go.bash to run pyomo for now

    @DLWoodruff
    DLWoodruff committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    ae2c4fb View commit details
    Browse the repository at this point in the history

  4. add a little agnostic doc

    @DLWoodruff
    DLWoodruff committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    e217d37 View commit details
    Browse the repository at this point in the history

  5. deal with merge conflicts

    @DLWoodruff
    DLWoodruff committed Jun 10, 2024
    Configuration menu
    Copy the full SHA
    e656377 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. trying to use a new pyotracker badge

    @DLWoodruff
    DLWoodruff committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    fce36a9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1 from DLWoodruff/badgerepair 

    trying to use a new pyotracker badge
    @DLWoodruff
    DLWoodruff authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    d58990b View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. a little more agnostic doc; fix bug in ampl guest

    @DLWoodruff
    DLWoodruff committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    731c280 View commit details
    Browse the repository at this point in the history

  2. typos

    @AymericPCLegros
    AymericPCLegros committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    54310d2 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. WIP, doesn't work yet, trying to geeralize step by step the farmer ex… 

    …ample
    @AymericPCLegros
    AymericPCLegros committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0a69744 View commit details
    Browse the repository at this point in the history

  2. WIP easier to test things, but name not adapted

    @AymericPCLegros
    AymericPCLegros committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    460ce38 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. Merge branch 'Pyomo:main' into main

    @DLWoodruff
    DLWoodruff authored Jun 29, 2024
    Configuration menu
    Copy the full SHA
    a6b3c12 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. we don't need or want the callouts in the thin wrapper

    @DLWoodruff
    DLWoodruff committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    4567d99 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. remove 'area' paste error; give an error with empty nonants list

    @DLWoodruff
    DLWoodruff committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    5f90ae1 View commit details
    Browse the repository at this point in the history

  2. Merge commit 'refs/pull/402/head' of https://github.com/Pyomo/mpi-sppy … 

    …into agnostic_gams
    @AymericPCLegros
    AymericPCLegros committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    66d4244 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. [WIP] GAMS does not work, but the doc is modified

    @AymericPCLegros
    AymericPCLegros committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    3e46869 View commit details
    Browse the repository at this point in the history

  2. completing the doc

    @AymericPCLegros
    AymericPCLegros committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    ca54a68 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'agnostic' into agnostic_local

    @AymericPCLegros
    AymericPCLegros authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    a5e6d6d View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from AymericPCLegros/agnostic_local 

    completing the doc
    @DLWoodruff
    DLWoodruff authored Jul 12, 2024
    Configuration menu
    Copy the full SHA
    154ff09 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. created a bundle example for farmer called by go.bash

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    0f5135e View commit details
    Browse the repository at this point in the history

  2. [WIP] bundles not yet working due, presumably, to objective function … 

    …scaling issues
    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    405a329 View commit details
    Browse the repository at this point in the history

  3. [WIP] making progress, but still need to get the names right

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    30a4b40 View commit details
    Browse the repository at this point in the history

  4. [WIP] things seem to be working apart from the xhatter

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    ae539d4 View commit details
    Browse the repository at this point in the history

  5. The generic Pyomo farmer example seems to be working with proper bundles

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    602a24c View commit details
    Browse the repository at this point in the history

  6. edit the archicture png directly

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    1512aec View commit details
    Browse the repository at this point in the history

  7. fix warning message

    @DLWoodruff
    DLWoodruff committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    92e981b View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2024

  1. trying to add the quadratic progamming nothing works yet

    @AymericPCLegros
    AymericPCLegros committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    3cfd82b View commit details
    Browse the repository at this point in the history

  2. adding the powerpoint to modify the image

    @AymericPCLegros
    AymericPCLegros committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    5769ad1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #4 from AymericPCLegros/agnostic_local 

    adding the powerpoint to modify the image
    @DLWoodruff
    DLWoodruff authored Jul 16, 2024
    Configuration menu
    Copy the full SHA
    25d0793 View commit details
    Browse the repository at this point in the history

  4. cleaning the file, gams for specific linearized farmer seem to work

    @AymericPCLegros
    AymericPCLegros committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    b23617f View commit details
    Browse the repository at this point in the history

  5. implemented farmer problem in gurobipy

    @keeks05
    keeks05 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    b9ac52c View commit details
    Browse the repository at this point in the history

  6. added scenario creator

    @keeks05
    keeks05 committed Jul 16, 2024
    Configuration menu
    Copy the full SHA
    2701329 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. implemented solve_one for gurobipy

    @keeks05
    keeks05 committed Jul 17, 2024
    Configuration menu
    Copy the full SHA
    2031248 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. [WIP] The Best Bound print is not correct

    @AymericPCLegros
    AymericPCLegros committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    8874867 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. [WIP] restauring the good values of prox_on...

    @AymericPCLegros
    AymericPCLegros committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    a08c87b View commit details
    Browse the repository at this point in the history

  2. adding print statements

    @AymericPCLegros
    AymericPCLegros committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    6751cd9 View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. the incumbent is not absurd anymore, but does not get better

    @AymericPCLegros
    AymericPCLegros committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    f45a077 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. gams farmer seems to work!

    @AymericPCLegros
    AymericPCLegros committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    c1de5c6 View commit details
    Browse the repository at this point in the history

  2. deleting prints

    @AymericPCLegros
    AymericPCLegros committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    ee87cdf View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff authored Jul 25, 2024
    Configuration menu
    Copy the full SHA
    a2c5cb9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    406ebfd View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. pip install -e . for testagnsotic.yml

    @DLWoodruff
    DLWoodruff committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    9cc57c6 View commit details
    Browse the repository at this point in the history

  2. update test for agnostic.py now in agnostic, not utils

    @DLWoodruff
    DLWoodruff committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    d3151ba View commit details
    Browse the repository at this point in the history

  3. starting generalizing gams for other problems than farmer

    @AymericPCLegros
    AymericPCLegros committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    6e7b251 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2024

  1. specifying which parts are generic in scenario creator

    @AymericPCLegros
    AymericPCLegros committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    dc679ba View commit details
    Browse the repository at this point in the history

  2. starting the generic gams file, should be changed

    @AymericPCLegros
    AymericPCLegros committed Jul 29, 2024
    Configuration menu
    Copy the full SHA
    761ead1 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. [WIP] the cylinders need to be modified

    @AymericPCLegros
    AymericPCLegros committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    3670298 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. [WIP] problem with the kwargs in generic gams

    @AymericPCLegros
    AymericPCLegros committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    7f3fb23 View commit details
    Browse the repository at this point in the history

  2. Agnostic generic GAMS seems to be working, at least with farmer

    @AymericPCLegros
    AymericPCLegros committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    ed5360e View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. starting to implement the transport example

    @AymericPCLegros
    AymericPCLegros committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    9686a62 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2024

  1. trying to adapt for sets defined as cartesian products

    @AymericPCLegros
    AymericPCLegros committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    8512713 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2024

  1. The files in the agnostic directory execute. Yet, the lagrangian does… 

    …n't converge, probably because of the non quadratic objective. Cartesian products sets are authorized. Deleting the files specific to farmer as they are not as general and well documented as the generic gams
    @AymericPCLegros
    AymericPCLegros committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    c66868d View commit details
    Browse the repository at this point in the history

  2. merge conflicts

    @AymericPCLegros
    AymericPCLegros committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    d33f1f1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from AymericPCLegros/agnostic_gams 

    Agnostic gams
    @DLWoodruff
    DLWoodruff authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    b4a65de View commit details
    Browse the repository at this point in the history

  4. images for agnostic architecture

    @AymericPCLegros
    AymericPCLegros committed Aug 9, 2024
    Configuration menu
    Copy the full SHA
    45c467f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #7 from AymericPCLegros/agnostic_gams 

    images for agnostic architecture
    @DLWoodruff
    DLWoodruff authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    0fde762 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff authored Aug 9, 2024
    Configuration menu
    Copy the full SHA
    abf3ffc View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1

    @DLWoodruff
    DLWoodruff committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    567fc8f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    51782e9 View commit details
    Browse the repository at this point in the history

  3. up to date agnostic figure

    @DLWoodruff
    DLWoodruff committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    a01c2d6 View commit details
    Browse the repository at this point in the history

  4. minor improvements to agnostic picture

    @DLWoodruff
    DLWoodruff committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    4431309 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2024

  1. Update agnostic_cylinders.py 

    add an option and better file names for write solution
    @DLWoodruff
    DLWoodruff authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    1401c09 View commit details
    Browse the repository at this point in the history

  2. Update agnostic_cylinders.py 

    fix typo in write_solution code
    @DLWoodruff
    DLWoodruff authored Aug 13, 2024
    Configuration menu
    Copy the full SHA
    7dfc81a View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2024

  1. fix error where the wrong obj was being used

    @DLWoodruff
    DLWoodruff committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    2f6d1df View commit details
    Browse the repository at this point in the history

  2. fix the objective function bug in the ampl_guest

    @DLWoodruff
    DLWoodruff committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f9287a1 View commit details
    Browse the repository at this point in the history

  3. solution output file names now given as a string on command line

    @DLWoodruff
    DLWoodruff committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    744fe5f View commit details
    Browse the repository at this point in the history

  4. try to add mpigap (untested)

    @DLWoodruff
    DLWoodruff committed Aug 15, 2024
    Configuration menu
    Copy the full SHA
    f339c4c View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2024

  1. implement farmer agnostic for gurobipy

    @keeks05
    keeks05 committed Aug 20, 2024
    Configuration menu
    Copy the full SHA
    e2aff6c View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. delete old gurobipy files

    @keeks05
    keeks05 committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    8c1a457 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. pasted in contents of farmer.py

    @keeks05
    keeks05 committed Aug 29, 2024
    Configuration menu
    Copy the full SHA
    dc9de39 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2024

  1. fix coefficient bug

    @keeks05
    keeks05 committed Aug 30, 2024
    Configuration menu
    Copy the full SHA
    c7b619f View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2024

  1. Update farmer_gurobipy_agnostic.py

    @DLWoodruff
    DLWoodruff authored Sep 4, 2024
    Configuration menu
    Copy the full SHA
    df43f4b View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2024

  1. Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1

    @DLWoodruff
    DLWoodruff committed Sep 12, 2024
    Configuration menu
    Copy the full SHA
    bd25b6e View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1

    @DLWoodruff
    DLWoodruff committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    f070a86 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'david-fork/agnostic' into pr-402

    @keeks05
    keeks05 committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    1e2f26a View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1

    @DLWoodruff
    DLWoodruff committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4bcba82 View commit details
    Browse the repository at this point in the history

  2. merge conflicts

    @DLWoodruff
    DLWoodruff committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    4a9784a View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Merge branch 'Pyomo:main' into agnostic

    @DLWoodruff
    DLWoodruff authored Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7441080 View commit details
    Browse the repository at this point in the history

  2. add unit test for gurobipy

    @keeks05
    keeks05 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    b211318 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. Merge pull request #8 from keeks05/pr-402 

    Pr 402
    @DLWoodruff
    DLWoodruff authored Sep 27, 2024
    Configuration menu
    Copy the full SHA
    d5d6afd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1

    @DLWoodruff
    DLWoodruff committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    c6d7f05 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    b10b63d View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Merge branch 'main' into agnostic

    @DLWoodruff
    DLWoodruff committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5cbab27 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2024

  1. paste to make farmer ampl example more like what people need

    @DLWoodruff
    DLWoodruff committed Oct 12, 2024
    Configuration menu
    Copy the full SHA
    8183e1c View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Files from Antarish

    @DLWoodruff
    DLWoodruff committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    ae79235 View commit details
    Browse the repository at this point in the history