Skip to content
This repository has been archived by the owner on Jul 2, 2020. It is now read-only.

Commit

Permalink
Merge tag 'choco-parsers-4.0.3' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
cprudhom committed Apr 28, 2017
2 parents 8ed2a35 + 0c94a73 commit b7c799b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 10 deletions.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Then, there are two ways to parse and solve a FlatZinc file with Choco:

* ##### Java front-end

```java -cp .:/path/to/choco-parsers-4.0.2-with-dependencies.jar org.chocosolver.parser.flatzinc.ChocoFZN [<options>] [<file>]```
```java -cp .:/path/to/choco-parsers-4.0.3-with-dependencies.jar org.chocosolver.parser.flatzinc.ChocoFZN [<options>] [<file>]```

Common __options__ are:
* ```-a``` : This causes the solver to search for, and output all solutions in case of satisfaction problems. For optimization problems, the solver search for an optimal solution and outputs all intermediate solutions. When this option is not given the solver should search for and output only the first solution (for satisfaction problems) or the best known one (for optimization problems).
Expand All @@ -57,13 +57,13 @@ Common __options__ are:

* ##### In a terminal (shell for Linux based OS)

```sh ./src/chocofzn/fzn-exec -jar /path/to/choco-parsers-4.0.2-with-dependencies.jar [<options>] [<file>]```
```sh ./src/chocofzn/fzn-exec -jar /path/to/choco-parsers-4.0.3-with-dependencies.jar [<options>] [<file>]```

Calling the shell with `-h` option will print the help message.

To avoid declaring the `-jar` option, you can export it once before calling the shell:

`PARSER_JAR=/path/to/choco-parsers-4.0.2-with-dependencies.jar`
`PARSER_JAR=/path/to/choco-parsers-4.0.3-with-dependencies.jar`

`sh ./src/chocoxcsp/xcsp3_exec [<options>] [<file>]`

Expand All @@ -78,7 +78,7 @@ Then, there are two ways to parse and solve a XCSP3 file with Choco:

* ##### Java front-end

```java -cp .:/path/to/choco-parsers-4.0.2-with-dependencies.jar org.chocosolver.parser.xcsp.ChocoXCSP [<options>] [<file>]```
```java -cp .:/path/to/choco-parsers-4.0.3-with-dependencies.jar org.chocosolver.parser.xcsp.ChocoXCSP [<options>] [<file>]```

Common __options__ are:
* ```-a``` : This causes the solver to search for, and output all solutions in case of satisfaction problems. For optimization problems, the solver search for an optimal solution and outputs all intermediate solutions. When this option is not given the solver should search for and output only the first solution (for satisfaction problems) or the best known one (for optimization problems).
Expand All @@ -91,13 +91,13 @@ Common __options__ are:

* ##### In a terminal (shell for Linux based OS)

```sh ./src/chocoxcsp/xcsp3_exec -jar /path/to/choco-parsers-4.0.2-with-dependencies.jar [<options>] [<file>]```
```sh ./src/chocoxcsp/xcsp3_exec -jar /path/to/choco-parsers-4.0.3-with-dependencies.jar [<options>] [<file>]```

Calling the shell with `-h` option will print the help message.

To avoid declaring the `-jar` option, you can export it once before calling the shell:

`PARSER_JAR=/path/to/choco-parsers-4.0.2-with-dependencies.jar`
`PARSER_JAR=/path/to/choco-parsers-4.0.3-with-dependencies.jar`

`sh ./src/chocoxcsp/xcsp3_exec [<options>] [<file>]`

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<groupId>org.choco-solver</groupId>
<artifactId>choco-parsers</artifactId>
<version>4.0.3-SNAPSHOT</version>
<version>4.0.3</version>
<packaging>jar</packaging>
<name>A FlatZinc parser for Choco3</name>

Expand Down
2 changes: 1 addition & 1 deletion src/chocofzn/fzn-exec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FREE_SEARCH="no"
NB_NODES=1
TIME_LIMIT=900000
JAVA_ARGS=""
CHOCO_JAR=${PARSER_JAR:=~/.m2/repository/org/choco-solver/choco-parsers/4.0.2-SNAPSHOT/choco-parsers-4.0.2-with-dependencies.jar}
CHOCO_JAR=${PARSER_JAR:=~/.m2/repository/org/choco-solver/choco-parsers/4.0.2-SNAPSHOT/choco-parsers-4.0.3-with-dependencies.jar}
usage="\
Usage: fzn_choco.sh [<options>] [<file>]
Expand Down
2 changes: 1 addition & 1 deletion src/chocoxcsp/xcsp3-exec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
NB_NODES=1
TIME_LIMIT=10000
JAVA_ARGS=""
CHOCO_JAR=${PARSER_JAR:=~/.m2/repository/org/choco-solver/choco-parsers/4.0.2-SNAPSHOT/choco-parsers-4.0.2-with-dependencies.jar}
CHOCO_JAR=${PARSER_JAR:=~/.m2/repository/org/choco-solver/choco-parsers/4.0.2-SNAPSHOT/choco-parsers-4.0.3-with-dependencies.jar}
usage="\
Usage: xcsp3_choco.sh [<options>] [<file>]
Expand Down
3 changes: 2 additions & 1 deletion src/main/bash/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ TAG="choco-parsers-${VERSION}"
git fetch || quit "unable to fetch master"
git checkout -b release || quit "unable to check master out"

mvn -q dependency:purge-local-repository || quit "unable to purge local repo"
#mvn -q dependency:purge-local-repository || quit "unable to purge local repo"
mvn clean install -DskipTests || quit "unable to install "

echo "New version is ${VERSION}"
YEAR=`LANG=en_US.utf8 date +"%Y"`
Expand Down

0 comments on commit b7c799b

Please sign in to comment.