TeamAmalgam / kodkod

Kodkod relational model finder
Other
3 stars 0 forks source link

Implement PartitionedGuidedImprovementAlgorithm #40

Closed mhyee closed 10 years ago

mhyee commented 10 years ago

This pull request fixes #32.

Issues open for discussion:

I don't intend to merge this in right away. I still have some refactoring and cleanup I want to do (which I'll document here), and some tests I want to run. However, I'm sending this pull request now so people can start looking over it.

In particular, when reviewing, please look out for any concurrency issues, and how the dependencies and scheduling are implemented.

Reviewers: @AtulanZaman @cpkleynhans @joseph2625

mhyee commented 10 years ago

Because of the whitespace cleanup, the overall diffs are a bit messed up. It might be easier to work with the actual commit: https://github.com/TeamAmalgam/kodkod/commit/c9ad8eb85c14e080ecedfe4ec9079172a37c8abf

mhyee commented 10 years ago

I pushed some refactor changes, and also resolved the merge conflicts.

The diff for MetricPoint.java is still messy because of whitespace cleanup (everything else should be fine), but the only change I made to MetricPoint.java was to add the partitionConstraints() method. So looking at the overall diff should be fine.

cpkleynhans commented 10 years ago

Other than the sorted set comment everything looks fine.

mhyee commented 10 years ago

Any comments? @AtulanZaman @joseph2625

joseph39 commented 10 years ago

Delete all boundary finding code because we are not doing the "find first Pareto point" anymore (related: #29).

mhyee commented 10 years ago

Fixed the issues. I got verbal approval to merge this into master, but I'm actually going to hold off until the dashboard is up. I eyeballed a run with queens_5_metrics_4 and it looked fine, but I'd like some more tests.