scipopt / papilo

Parallel Presolve for Integer and Linear Optimization
GNU Lesser General Public License v3.0
64 stars 17 forks source link

Obp parser #18

Closed freemin7 closed 2 years ago

freemin7 commented 2 years ago

I will need some help with 1, 2, 5. If 2 is done but something fails, i am going to fix the code.

freemin7 commented 2 years ago

See #15

fschloesser commented 2 years ago

Something is wrong here, are you sure you did the rebase correctly onto the develop branch? The pull request should not be affecting the version in CMakeLists.txt like it does at the moment.

freemin7 commented 2 years ago

I am not sure at all. I tried. I can try again. I am not even sure how i would reverse it or debug it though.

fschloesser commented 2 years ago

I created a new branch OBP_Parser_based_on_develop off of yours that is rebased on develop, can you allow me to push to your fork?

freemin7 commented 2 years ago

I hope adding as a collaborator on the repository did the trick and thanks.

freemin7 commented 2 years ago

I don't particularly care about the git history. How about we just take the finished file from my branch and add that to a known good branch?

fschloesser commented 2 years ago

It seems I cannot push still. Since you are just adding a file, your solution should also work: Just create a new branch off of develop and check in your file.

freemin7 commented 2 years ago

Gute Nacht! I will look into that tomorrow.

I think i found my error which led to the mess. I assumed that develop is strictly ahead of master, so i just appended the changes i made to master, to develop while at the same time you bumped the PAPILO_VERSION_PATCH leading to my patch including the new version bump when i ported all changes to master over to develop.

fschloesser commented 2 years ago

You let us know if you need further assistance? I like the idea of just taking a copy of your file and then resetting the branch to add it in a single commit. You could then force push it (it's on your own fork anyway)