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

Agnostic #402

Merged
merged 239 commits into from
Jan 10, 2025
Merged

Agnostic #402

merged 239 commits into from
Jan 10, 2025

Conversation

DLWoodruff
Copy link
Collaborator

@DLWoodruff DLWoodruff commented Jun 10, 2024 •
edited
Loading

With respect to the guest side, it is very preliminary. On the host side, the callouts seems to work well, but more features probably need callouts.

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 16 commits November 24, 2024 14:42
@DLWoodruff
one more need_solution needed
428a1eb
@DLWoodruff
one test is failing on an import and I can't figure it out
7b2e1be
@DLWoodruff
trying to clean up tests, but one import might eluded me. Last push f…
b03ec39 
…or today
@DLWoodruff
add an __init__.ph for agnostic examples to github
8d690c0
@DLWoodruff
add a copy of farmer.py for easy access
a23c776
@DLWoodruff
adding a file needed by ampl tests
020ee20
@DLWoodruff
we are adding tests that use cplex
d9a471b
@DLWoodruff
cplex is not available on gitub; use cplex_direct
3831206
@DLWoodruff
dropping pyomo from afew_agnostic test because I can't get the solver…
912ebb8 
… to work correctly on github
@DLWoodruff
remove and rename a few files
ba4b56e
@DLWoodruff
add the steel example for ampl agnostic
b9bbdd2
@DLWoodruff
Merge branch 'main' of https://github.com/DLWoodruff/mpi-sppy-1
3b24ce2
@DLWoodruff
Merge branch 'main' into agnostic
156dfc6
@DLWoodruff
move some files out of the examples.farmer directory to a subdirectory
4b7f87c
@DLWoodruff
headers
a26d32c
@DLWoodruff
two restored files were also in the wrong place
31d7993
@DLWoodruff DLWoodruff requested a review from bknueven December 1, 2024 23:49
bknueven
bknueven reviewed Dec 6, 2024
View reviewed changes
agnostic.txt Outdated Show resolved Hide resolved
examples/farmer/GAMS/farmer_average.py Show resolved Hide resolved
examples/farmer/agnostic/AAAreadme.txt Outdated Show resolved Hide resolved
examples/farmer/agnostic/agnostic_gams_cylinders.py Outdated Show resolved Hide resolved
examples/farmer/agnostic/farmer.mod Outdated Show resolved Hide resolved
@DLWoodruff DLWoodruff requested a review from bknueven December 29, 2024 01:15
@bknueven bknueven merged commit abf9569 into Pyomo:main Jan 10, 2025
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bknueven bknueven bknueven approved these changes

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