Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/QuiltMC/quilt-loader-sat4j


https://github.com/QuiltMC/quilt-loader-sat4j

Using anonymous inner class instead of using main class as SolutionListener.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1680 ba638df5-4473-46d1-82f8-c...

6b5310874183f91569820763bc70b0e9e23e3f23 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added messages to explain what the solver is doing.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1679 ba638df5-4473-46d1-82f8-c...

aba92b7b005c046b8196ab8b4fcf5c3ea4dfc5dd authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Updated launcher to allow compute all muses.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1678 ba638df5-4473-46d1-82f8-c...

015d7a3427ed764498a4c80121a00b3554d7ea3b authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Updated launcher to allow compute all muses.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1677 ba638df5-4473-46d1-82f8-c...

4f8996c67064b32fa36c203dbf625a0e6c4d985f authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Changed a bit the implementation of AbstractClauseSelector to allow that solver to be used both from the outside (external state) as if the selector variables were forced to false and from power users procedures (internal state) where the power user has the responsibility to make sense of verified selector variables.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1676 ba638df5-4473-46d1-82f8-c...

ccc53e6efa9be272d6b534177f9ad8b5f649792a authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
removed spurious sop.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1675 ba638df5-4473-46d1-82f8-c...

5f72e810487f923f4ea57fd75a853223368a5203 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added objective function to the input.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1674 ba638df5-4473-46d1-82f8-c...

9fdcd4514d2979aa8f9c381b7af1c3c30b835687 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added objective function to the input.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1673 ba638df5-4473-46d1-82f8-c...

a21ed8d60ac353640d0fa88eb08f334718627572 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Removed spurious debug messages.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1672 ba638df5-4473-46d1-82f8-c...

04aae9bedb59a8f43efecda643fcfc91da48d1b6 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Implemented equals/hashcode methods to allow writing mock tests.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1671 ba638df5-4473-46d1-82f8-c...

b4a917b838eb2268b48a8323e19bf6450c5f649f authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed equals methods to make readonly vectors equal to their classical counterpart if they contain the same values in the same order.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1670 ba638df5-4473-46d1-82f8-c...

6080bd198ef51a9149bdfab52080cd0ffb37e154 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue SAT-85.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1669 ba638df5-4473-46d1-82f8-c...

7f4556decc1020ab017f056dccc978a4a5d69f12 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue with first line (p cnf not starting at 0 but 7).

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1668 ba638df5-4473-46d1-82f8-c...

28cf778c0b1303936d20c28ad66e680c30cb7de9 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
added mockito in lib directory

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1667 ba638df5-4473-46d1-82f8-c...

67200644e6eb51877ebceafbf04c2813831ff4a3 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Test cases showing the encoding of PB constraints.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1666 ba638df5-4473-46d1-82f8-c...

3aad0cfa683b130d732d8621411b8e3a34c5efb9 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Modified the initial parser to allow a subclass to manage PB constraints.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1665 ba638df5-4473-46d1-82f8-c...

0d73439397584d971efb5f0382400db58d85201a authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Test cases showing the encoding of PB constraints.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1664 ba638df5-4473-46d1-82f8-c...

637753ac6f18ee5a3b1fce9882c7292fe12d0db2 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added JavaDoc comment.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1663 ba638df5-4473-46d1-82f8-c...

8a435d28d64f65b5bd38abdf40e3a284ab2ece76 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Now preserving the order in which the constraints are entered in the solver.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1662 ba638df5-4473-46d1-82f8-c...

b6f299621af26279bce0c16871a757ab52c5e149 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Now preserving the order in which the constraints are entered in the solver.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1661 ba638df5-4473-46d1-82f8-c...

b52b8e9faece7e73213567e66ac79de41ae1f2ba authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a test case for providing a model in JSON format.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1660 ba638df5-4473-46d1-82f8-c...

cebb368ce6a6fa6b7efbb74bf1ff5b6cdaec741e authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a test case for providing a model in JSON format.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1659 ba638df5-4473-46d1-82f8-c...

d2c1e08cb28290b4385c7ca8399659e337111514 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Take into account the == comparator, as allowed by the regular expression.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1658 ba638df5-4473-46d1-82f8-c...

b14dfcb289e793448edff6b2dff8e71ca82f56cf authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
First implementation of the JSONReader for clauses and cardinality constraints.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1657 ba638df5-4473-46d1-82f8-c...

ce850e50fbe0285236e6ad03eda12278aeb6f8f7 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Test case for feature Request SAT-83, for clauses and cardinality constraints.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1656 ba638df5-4473-46d1-82f8-c...

f9ec1e46a096f5a4dae2ce034f39cf2eac9f7c79 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Overriden VecInt.EMPTY equals and hashCode method to allow using mockito properly.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1655 ba638df5-4473-46d1-82f8-c...

de88748331dfe84c07cbe9b7ae6cbb17b56fba78 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a few comments to BooleanFormulaParser

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1654 ba638df5-4473-46d1-82f8-c...

e3fec1afe05ef8879f26649960393b2e0e45298b authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
First draft for a parser for boolean formula : allows to transform a string to a list of BoolExp

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1653 ba638df5-4473-46d1-82f8-c...

b7e823297c7fe181a4d52ed19a1723ad20bf6e91 authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fix for bug SAT-84.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1652 ba638df5-4473-46d1-82f8-c...

28bda2ac3fbd75ad6288dd2a903069f2e21eecc0 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Test case showing the issue reported in bug report SAT-84.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1651 ba638df5-4473-46d1-82f8-c...

0332b1a83d2641312a1cae5216ea280e25730b7a authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed completely the issue with learned PB on the fly: the coefs used were not the normalized ones ...

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1650 ba638df5-4473-46d1-82f8-c...

2856f40a911b65c45ca47ca0648ed2979f4b9712 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed NPE when there is no objective function.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1649 ba638df5-4473-46d1-82f8-c...

e87180bfaa9ffdf96d16f7fefb3821bd9382a234 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Updated addXxx methods to return a constraint that can later be removed.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1648 ba638df5-4473-46d1-82f8-c...

d7f201082abeb3d0482d95f7f7375cc7bbdb7245 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Updated addXxx methods to return a constraint that can later be removed.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1647 ba638df5-4473-46d1-82f8-c...

7e77c5ae2024b6e3f8707dece296bdc7c2cd6468 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Checking that the trailLim is not empty!

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1646 ba638df5-4473-46d1-82f8-c...

d2d4830c91b05806f1e239bccfb03e752c9bb941 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
updated ObjectiveReducerPBSolverDecorator to recognize more atMostOne constraints

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1645 ba638df5-4473-46d1-82f8-c...

6f0767d25d365c45c71b8640d9ffd68e2c7786f4 authored about 12 years ago by lonca <lonca@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue when there is no objective function.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1644 ba638df5-4473-46d1-82f8-c...

a9cb8208cbe72caf0a005ec28182469d3c97267f authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue with new PB constraints generated on the fly.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1643 ba638df5-4473-46d1-82f8-c...

f469cc90d95ed3be5ec28645e4af34122f80b5af authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a new callback method in Solution Listener.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1642 ba638df5-4473-46d1-82f8-c...

cf221fa716a99e3f821e3a6882080322a0e609e2 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added new method calcReasonOnTheFly in Constr.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1641 ba638df5-4473-46d1-82f8-c...

ecbe68e9e24b2a724b34199b6805628442bd2332 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added new method calcReasonOnTheFly in Constr.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1640 ba638df5-4473-46d1-82f8-c...

8cea25ef695014c4797a9666628a1f21656a96e1 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
added org.sat4j.pb.core.ObjectiveReducerPBSolverDecorator, an IPBSolver decorator which reduces the objective size while an atMost constraint of degree 1 concerns only objective variables (this process adds some variables and constraints)

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1639 ba638df5-4473-46d1-82f8-c...

991633b1544413518bd6ec081d22549e7cf076ee authored about 12 years ago by lonca <lonca@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Changing SearchOptimizerListener to be more in sync with SearchEnumeratorListener.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1638 ba638df5-4473-46d1-82f8-c...

7b5be32fec5ea942c0d0598ab12d5e016aeae956 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Disabled default visualization of variable evaluation.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1637 ba638df5-4473-46d1-82f8-c...

1234407a4f51bc5ebc2bbdd723878e0aa3daf094 authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Tried to correct a display bug in the dashboard (this display bug does not appear on my computer, this is why it is only a try)

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1636 ba638df5-4473-46d1-82f8-c...

f9c95bc0995697a4939abfbec46f5e2ae367d83a authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added tostring methods

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1635 ba638df5-4473-46d1-82f8-c...

971dc0a257c54c26f7f483c9b10e43d5fb363ad8 authored about 12 years ago by anterak13 <anterak13@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added new methods corresponding to cardinality constraints in the wrapper.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1634 ba638df5-4473-46d1-82f8-c...

3606a00ec53a1c3e106c32d39aa9c18472e2c720 authored about 12 years ago by anterak13 <anterak13@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Updated the DSL keywords to have a more natural priority handling by the scala parser (parentheses are still needed to be sure of how things are parsed).

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1633 ba638df5-4473-46d1-82f8-c...

968bd0ba2bf9c8f035b8dd02b079f5c1776ff7ea authored about 12 years ago by anterak13 <anterak13@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Contains classes for representing a flat constaint system (clauses+cardinality constraints), a flattener which takes a Boolean Expression of the DSL and generates a flat constraint system encoding the expression.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1632 ba638df5-4473-46d1-82f8-c...

c01d09204d5527cc616b44bbc9f1b8943cd3ba70 authored about 12 years ago by anterak13 <anterak13@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Allow to do optimisation with the PB launcher and internal optimizer listener. use -DINTERNAL=true system property to activate it.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1631 ba638df5-4473-46d1-82f8-c...

07edc5062c0cd1aa65c9dbeef7d55f05d6a9160e authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
uses register() from AtLeast.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1630 ba638df5-4473-46d1-82f8-c...

14e21e5b21d8fb5fe5f450f1754e1edd492a115e authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
added a new IPBSolverService interface and an internal optimizer

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1629 ba638df5-4473-46d1-82f8-c...

c13067faafea2fe47e41c1f523492895c0a9b59a authored about 12 years ago by lonca <lonca@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
changed visibility of sharedConflit attribute

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1628 ba638df5-4473-46d1-82f8-c...

c885c128377917a3034c02cda9fc8c81dc2a47eb authored about 12 years ago by lonca <lonca@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed class cast exception. However, the search enumerators are not working yet.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1627 ba638df5-4473-46d1-82f8-c...

0ec4aabdf71700b14b35204b542b9e31479920f3 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
create an unregistered pseudo-boolean constraint, given the literals, the coefs and the degree, is added. The code still should be improved quickly.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1626 ba638df5-4473-46d1-82f8-c...

d38138701867b6c6cf2bf5af9e449700a86deec6 authored about 12 years ago by parrain <parrain@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Appended OnTheFly to the addClause and addAtMost methods to avoid confusion with the original addXXX methods.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1625 ba638df5-4473-46d1-82f8-c...

708613271e7c340e1e1eadf08e7588ea4015b293 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Backtracking until a falsified literal is found instead of skipping satisfied literals

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1624 ba638df5-4473-46d1-82f8-c...

d3be56137c0565224372296e906f9e020dcb919d authored about 12 years ago by lonca <lonca@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
create an unregistered pseudo-boolean constraint, given the literals, the coefs and the degree, is added. The code should be improved quickly.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1623 ba638df5-4473-46d1-82f8-c...

92deaf70622413d622c06b9a9c173099b7f7b25a authored about 12 years ago by parrain <parrain@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue with the double k options.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1622 ba638df5-4473-46d1-82f8-c...

fe43ce9540f0bd507b326b4a29e68fdc7ff991b3 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Implemented the possibility to add card constraints on the fly in the solver.

The solver backtrack to the adequate decision level before going through the analysis procedure.
...

c2aad645f4149474c07b924a76f631142d7ec0c8 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Using by default the same cnf reader than a sat solver.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1620 ba638df5-4473-46d1-82f8-c...

b875d0e44e61e8dd241a8b6ff84ce453632b6703 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1619 ba638df5-4473-46d1-82f8-c3ae2a17a6e1

c1c18ecf8f50e4ac441a9a16c50002825a60f736 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed issue when there are several comments and no aggregation criteria.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1618 ba638df5-4473-46d1-82f8-c...

1359a76e9d2dccf225317fbd04a155dfb51bcff3 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added code for optimization time out in admitABetterSolution method. Also called expireTimeOut before setTimeOut

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1617 ba638df5-4473-46d1-82f8-c...

81eb7a80ad06148339e7c4d81262ab0b038141ba authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added visibility public to setTimeoutForFindingBetterSolution method in OptToPBSATAdapter

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1616 ba638df5-4473-46d1-82f8-c...

7c25224e452c96d0492218e4122cc50e337b307d authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a new method to allow a specific timeout during optimization.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1615 ba638df5-4473-46d1-82f8-c...

6feec69284e36f1b4c7af23a459e1bcd0165bd1b authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a new method to allow a specific timeout during optimization.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1614 ba638df5-4473-46d1-82f8-c...

0d8c2dc8cc11b10ff2eedd21e041e328395a371e authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a new method to allow a specific timeout during optimization.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1613 ba638df5-4473-46d1-82f8-c...

71c9d3cfd207b77753c68ab5a92f84bf58e170a2 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added a new method to allow a specific timeout during optimization.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1612 ba638df5-4473-46d1-82f8-c...

f022fd14c31f98d0547a433f83e27e7b8abd7311 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
SearchListener now uses addClause, which is expected to keep the constraint, instead of backtrack, which should not according to the API.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1611 ba638df5-4473-46d1-82f8-c...

c9ea9afbbd568547f41cbb358643a7fd20d4e625 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Forgot to register the new clause :(

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1610 ba638df5-4473-46d1-82f8-c...

a6c64398f697bd713e5001c3ff3aba381c3031f1 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed the backtrack method: clauses are now added to the solver, instead of just learning them (thus they could be removed at any time by the solver).

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1609 ba638df5-4473-46d1-82f8-...

f4a89a1e7c19b32b6983b40ec85dd26c82a5c247 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Entered a fix for the new Reader that was not setting the objective function.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1608 ba638df5-4473-46d1-82f8-c...

8386e404bab47aae30262ba4e804c4bc456c17a7 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
- Added matches for Implies and Iff in tseitin transformation

- Added matches for IndexedIdent in encodeClause

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroo...

574eb344a54ec12da0b8fec3d1760e9002685377 authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Ajout d'identificateurs indicés, de Implies, Iff et cardinalités dans l'ast

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1606 ba638df5-4473-46d1-82f8-c...

f0c4d59241d9b299396a11bc070213139636f61d authored about 12 years ago by anterak13 <anterak13@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Corrected mistake in addClause method => negation weight has to be taken into account

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1605 ba638df5-4473-46d1-82f8-c...

56f45582873aeb4a9f60505ae26b96a093bed972 authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
- Changed addExactly(literals,weight) so that the negation weight is taken into account when computing the degree of the constraint

- Changed addClause => output -1 x instead of +1 ~x

git-svn-id: svn+ssh://svn.forge.ow2.org/svn...

540fbbd314737c6ad51ea33d137559ef8e543378 authored about 12 years ago by sroussel <sroussel@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Making sure the solution is not verbose by default.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1603 ba638df5-4473-46d1-82f8-c...

88c9605e13564b955b7156ce7038f9ec04c38423 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
The solver is now displaying each solution found in verbose mode.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1602 ba638df5-4473-46d1-82f8-c...

75d3c6aaf896fb424ddd502a3434bfd56c862cfb authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Allow method solve to access the reader.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1601 ba638df5-4473-46d1-82f8-c...

dff92a1f6817ad735c6a2ef009033ffca9a6c91d authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Add org.sat4j.pb in Eclipse Java project build path.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1600 ba638df5-4473-46d1-82f8-c...

015dc4553db0ae37705055afca3e883dcfce9bb1 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Retrieving the problem from readProblem() call, to behave as in AbstractLauncher. Hope I did not break something specific to the dashboard :)

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1599 ba638df5-4473-46d1-82f8-c...

ae540fe42b3b92d8d268a7d79bca52665e3f4a62 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Making the 2012 version of the reader the default.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1598 ba638df5-4473-46d1-82f8-c...

9e8a3182804b941a545736523bb4899b72f0a344 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Making the 2012 version of the reader the default.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1597 ba638df5-4473-46d1-82f8-c...

53220c7cb4ebd3c4d829f9744c4cc381ad15d578 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Reader for multiple objective functions.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1596 ba638df5-4473-46d1-82f8-c...

8c062e263e4a0bedde1981a45c6beca312d55910 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Improve a bit that class to make it work with classical optimization launcher.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1595 ba638df5-4473-46d1-82f8-c...

0d1e7670434acff9651705aba25b9a9a735c589b authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Make a method protected to allow subclass to override it.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1594 ba638df5-4473-46d1-82f8-c...

8ea29cb29528a82f2a82ce7c23863ab8b9aa0423 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Quick and dirty implementation of lexico feedback on the launcher (use of instanceof).

It would be nice to manage that in a better way. Cannot find one right now without huge refactori...

0e4d4785317b003b6b5af06c30c8a04aa7f6c252 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
using problem instead of solver as argument of solve to allow the reader to create a lexico decorator.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1592 ba638df5-4473-46d1-82f8-c...

d483ce4f2f67a2398e8f6ca19974e030b9d058b8 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Added method to access each criterion value.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1591 ba638df5-4473-46d1-82f8-c...

1cad6767e487d574a05be021d81eebf537f81222 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Using addExactly instead of addAtmost() and addAlLeast()

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1590 ba638df5-4473-46d1-82f8-c...

268c6935b0242e685a0a9cee4b587ffbfd404335 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Removed @override annotations for implementations of an interface (not allowed in Java 1.5).

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1589 ba638df5-4473-46d1-82f8-c...

d5ac4b5748b161ca94fc52afdb906917278e53ba authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed assertion and qhead init value.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1588 ba638df5-4473-46d1-82f8-c...

01570f49e2da7c689cad6c09bbfc0a7d677de638 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Fixed test: the solver new returns true to isSatisfiable) when all the models have been found.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1587 ba638df5-4473-46d1-82f8-c...

92b17ca41562b9742ca62b7ded055bf9f7bf61b8 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Delegating the possibility to display all solutions to AbstractLauncher.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1586 ba638df5-4473-46d1-82f8-c...

d06ebd49ee0b2fd5bc7c64faa9d0cdfe5d59f0ab authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Prefixing the message regarding the solution found with c.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1585 ba638df5-4473-46d1-82f8-c...

b4c93868696ff9d1104da074d0de9ce43d557ecc authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Using a single line to display solution number on a console.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1584 ba638df5-4473-46d1-82f8-c...

3459bec811809e638854a71f1ede8d7f8efd3a47 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Allow the solver to be stopped after the first solution is found.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1583 ba638df5-4473-46d1-82f8-c...

8540b2bd07d6308aec9da625cf14d98c8888b57f authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
Allow Abstract launcher to compute all solutions of a CNF.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1582 ba638df5-4473-46d1-82f8-c...

daee05b8eab518458de63933fcfd96ce194fe767 authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>
All the solver to display all solutions.

git-svn-id: svn+ssh://svn.forge.ow2.org/svnroot/sat4j/maven/trunk@1581 ba638df5-4473-46d1-82f8-c...

cb3094419487fbc71b7baca5c7a84148333f095b authored about 12 years ago by leberre <leberre@ba638df5-4473-46d1-82f8-c3ae2a17a6e1>