StructJuMP / StructJuMP.jl

A block-structured optimization framework for JuMP
Other
54 stars 19 forks source link

the working structjump code #16

Closed fqiang closed 8 years ago

fqiang commented 8 years ago
mlubin commented 8 years ago

@joehuchette, now that PIPS is publicly released, could we set up travis CI here?

joehuchette commented 8 years ago

Since it's PIPS specific, it seems like src/pips_structure_interface.jl should go in PIPS.jl or somewhere similar?

fqiang commented 8 years ago

@joehuchette Julia Structure interface for PIPS-NLP is at repository in PIPS, which I think serves the same purpose as the PIPS.jl. pips_structure_interface.jl is a glue code between them. I think it can go with either one. However I think it is a good demonstration of the usage of the StructJuMP.

fqiang commented 8 years ago

@joehuchette maybe put it in another folder, but I am not sure what's the best way to present this.

joehuchette commented 8 years ago

I really think the PIPS specific code needs to go somewhere else; this repo should only include solver-agnostic modeling code. PIPS.jl seems like the natural place to put it.

joehuchette commented 8 years ago

Thanks @fqiang, looks good now. I have a few small comments. Can you please address those, and then squash this down to a single commit?

fqiang commented 8 years ago

@joehuchette Thanks. Just merge the commits into 35e7412. Let me know if that works.

joehuchette commented 8 years ago

Didn't seem to work, there are still 73 commits, and merge conflicts with master.

fqiang commented 8 years ago

resolved the conflict, do you know the command to merge commits into one. or I will need to do another PR to achieve this? @joehuchette

joehuchette commented 8 years ago

You can use git rebase -i master. For each commit besides the first, change pick to f and step through the rebase. You can just open another PR if you run into issues, though.

fqiang commented 8 years ago

close this one to open a new PR.