artofscience / SAOR

Sequential Approximate Optimization Repository
GNU General Public License v3.0
5 stars 1 forks source link

dev-mixed to dev #35

Closed Giannis1993 closed 3 years ago

Giannis1993 commented 3 years ago

Implemented a class for mixed schemes. It works, but I think it needs some profiling/improvements. You can test it via all scripts called tests/test_mixed_*.py.

artofscience commented 3 years ago

@aatmdelissen can you review, such that we can finish this pull request? @Giannis1993 can you look at the current conflicts?

Giannis1993 commented 3 years ago

Since Stijn added some work on the dev branch, after talking to Stijn I merged everything into dev to avoid confusion. Whoever wishes to review/edit the code can now fetch the dev branch. I deleted the dev-mixed.