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.

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

Release 0.4.3 #26

Merged
merged 37 commits into from Dec 22, 2015
Merged

Release 0.4.3 #26

merged 37 commits into from Dec 22, 2015

Conversation

mantkiew
Copy link
Member

  • Port to latest Choco3 version 3.3.3
  • Support nested abstract clafers
  • Added API for specifying ordering of clafers by giving priority branchingPriority([[a,b], [c,d], [e]]);
  • Improved performance, see user's comment
  • Improved pretty printing of instances to harmonize with ClaferIG
  • Fixed multiplication/division and overflows handling
  • Fixed handling of zeroes in division

JLiangWaterloo and others added 25 commits November 4, 2015 06:16
…ract clafers.

The model now has two roots: one is abstract, and the other is concrete. For example, consider the following model:

    abstract A
        B
    abstract C : A
        abstract D
    E : C
    F

This is represented in AstModel as:

    abstract abstractRoot
        abstract clafer
        abstract A : clafer
            B : clafer
        abstract C : A
            abstract D : clafer
        E : C
        F : clafer
    root : abstractRoot
…in on function happens in a different order than usual.
…e values in initial propagation of join appears unexpectedly as an event in the incremental propagation.
…e values in initial propagation of join appears unexpectedly as an event in the incremental propagation.
…iority.

For example, add "branchingPriority([[a,b], [c,d], [e]]);" to the Javascript will
construct a ClaferOption with 1) Clafers a and b as the highest priority, 2) Clafers
c and d as the second highest priority, 3) Clafers e as the third highest priority,
4) the remaining Clafers as the lowest priority.

As usual, use the Javascript class to parse the input file. The parsed object (JavascriptFile)
now contains an additional field for ClaferOption. This ClaferOption object must be passed to
the compiler for the branching priority to take effect.

For example:

   JavascriptFile p = Javascript.readModel(testFile);
   ClaferSolver s = ClaferCompiler.compile(p.getModel(), p.getScope(), p.getOption());
@mantkiew mantkiew self-assigned this Dec 18, 2015
@mantkiew mantkiew added this to the 0.4.3 milestone Dec 18, 2015
JLiangWaterloo and others added 9 commits December 19, 2015 20:07
For example, for the expression a * b with a mulRange of {-2,...,2} will restrict the possibilities of a and b such that the product must lie in this range even if the multiplication is under a conditional. This will omit some potentially valid solutions. With the fix, you may notice more instances than previously if your model contains multiplication.
Previously, an expression a / b will always prohibit b = 0, even if the division is under a conditional. With this fix, you may see more solutions than previously found.
mantkiew added a commit that referenced this pull request Dec 22, 2015
@mantkiew mantkiew merged commit 6a9ec31 into master Dec 22, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants