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

Conversation

DLWoodruff
Copy link
Collaborator

No description provided.

DLWoodruff and others added 30 commits December 18, 2022 18:57
@DLWoodruff
add some notes about agnostic
f943763
@DLWoodruff
minor edits to txt file
7ac63b3
@DLWoodruff
Merge branch 'main' into agnostic
62ff84e
@DLWoodruff
just getting started; more questions than answers
191027d
@DLWoodruff
[WIP] scenario creator for agnostic object is roughed in but totally …
6ef0c0b 
…untested
@DLWoodruff
starting to make agnostic work
43fe36c
@DLWoodruff
scenario creation executes
537e3ba
@DLWoodruff
starting to modify phbase for agnostic
4423e00
@DLWoodruff
a bash script to be deleted later
ea5f306
@DLWoodruff
WIP; early work on ph callback; starting attach to obj
3fcf43d
@DLWoodruff
WIP; still working on attach_PH_to_objective (need xbars)
159d6e3
@DLWoodruff
ready to start work on solve_one
1dd7c46
@DLWoodruff
starting on solve_one
bfca106
@DLWoodruff
solve_one executes; need to debug _reenable_W
1d4b156
@DLWoodruff
PH is executing; need to write a solution and start working on spokes
440156b
@DLWoodruff
move the example to the examples dir
8c0e510
@DLWoodruff
ready to try xhatter
06754dc
@DLWoodruff
xhatshuffle seems to be working
c24c3be
@DLWoodruff
WIP: debugging W's in lagrangian
6492b8f
@DLWoodruff
debugging output
23e41c1
@DLWoodruff
the ampl version of farmer (stochastic)
64efddb
@DLWoodruff
single scenario farmer works
1ebdba4
@DLWoodruff
examples of amplpy from AMPL
3b88743
@DLWoodruff
lshaped did not yet have the uniform probabiity option
26bd8bf
@DLWoodruff
draft of ampl create scenario written
370fba9
@DLWoodruff
[WIP] almost done with draft of AMPL agnostic; one copy function left
c94cccc
@DLWoodruff
w_ and prox_ disabled do not need a callout
2ae66d7
@DLWoodruff
farmer_ampl_agnostic.py is sort of done, but totally untested
c4ea3c4
@DLWoodruff
[WIP] working on solving
c1d8c7e
@DLWoodruff
solve executes; now we need actual scenarios
a7ec164
DLWoodruff and others added 19 commits August 12, 2024 10:32
@DLWoodruff
Merge branch 'main' into agnostic
51782e9
@DLWoodruff
up to date agnostic figure
a01c2d6
@DLWoodruff
minor improvements to agnostic picture
4431309
@DLWoodruff
Update agnostic_cylinders.py
1401c09 
add an option and better file names for write solution
@DLWoodruff
Update agnostic_cylinders.py
7dfc81a 
fix typo in write_solution code
@DLWoodruff
fix error where the wrong obj was being used
2f6d1df
@DLWoodruff
fix the objective function bug in the ampl_guest
f9287a1
@DLWoodruff
solution output file names now given as a string on command line
744fe5f
@DLWoodruff
try to add mpigap (untested)
f339c4c
@keeks05
implement farmer agnostic for gurobipy
e2aff6c
@keeks05
delete old gurobipy files
8c1a457
@keeks05
pasted in contents of farmer.py
dc9de39
@keeks05
fix coefficient bug
c7b619f
@DLWoodruff
Update farmer_gurobipy_agnostic.py
df43f4b
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
bd25b6e
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
f070a86
@keeks05
Merge remote-tracking branch 'david-fork/agnostic' into pr-402
1e2f26a
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
4bcba82
@DLWoodruff
merge conflicts
4a9784a
@bknueven bknueven mentioned this pull request Sep 18, 2024
Draft
@DLWoodruff DLWoodruff marked this pull request as ready for review September 27, 2024 16:47
@DLWoodruff DLWoodruff marked this pull request as draft September 27, 2024 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@DLWoodruff @bknueven @AymericPCLegros @keeks05