Skip to content

Commit 6cfec3a

Browse files
committed
tangle the solver scripts for setting easily the jar version #84
1 parent f444e16 commit 6cfec3a

File tree

4 files changed

+38
-43
lines changed

4 files changed

+38
-43
lines changed

src/main/benchmarks/README.org

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,22 @@
4949
}
5050
#+END_SRC
5151

52+
5253
* Generate
5354

54-
** Configure the solver
55+
** Create the solver
5556

56-
#+BEGIN_SRC sh
57-
rm solver.sh
58-
ln -s solver-generate.sh solver.sh
57+
#+BEGIN_SRC sh :tangle solver.sh
58+
JAR=cryptator-0.5.1-SNAPSHOT-with-dependencies.jar
59+
MAINCLASS=cryptator.Cryptagen
60+
61+
MAINARGS=`cat $1 $2 | xargs`
62+
63+
INSTNAME=`echo $INSTNAME | sed 's/\s-*/-/g'`
64+
echo i `basename -s .dat $2`
65+
## SEED=`shuf -i1-1000 -n1`
66+
java -server -Xms512m -Xmx8192m -cp $JAR $MAINCLASS $MAINARGS
67+
exit $?
5968
#+END_SRC
6069

6170
** Configure instances
@@ -85,11 +94,16 @@
8594

8695

8796
* Generate and Solve
88-
** Configure the solver
97+
** Create the solver
8998

90-
#+BEGIN_SRC sh
91-
rm solver.sh
92-
ln -s solver-generate-and-solve.sh solver.sh
99+
#+BEGIN_SRC sh :tangle solver.sh
100+
JAR=cryptator-0.5.1-SNAPSHOT-with-dependencies.jar
101+
MAINCLASS=cryptator.Cryptagen
102+
103+
MAINARGS=`cat $1 $2 | xargs`
104+
105+
java -server -Xms512m -Xmx8192m -cp $JAR $MAINCLASS $MAINARGS | head -n -10
106+
exit $?
93107
#+END_SRC
94108

95109
** Configure instances
@@ -143,11 +157,23 @@ The word lists ~colors.txt~ and ~monsters.txt~ takes the most time by far (aroun
143157

144158

145159
* Solve
146-
** Configure the solver
160+
** Create the solver
147161

148-
#+BEGIN_SRC sh
149-
rm solver.sh
150-
ln -s solver-solve.sh solver.sh
162+
#+BEGIN_SRC sh :tangle solver.sh
163+
JAR=cryptator-0.5.1-SNAPSHOT-with-dependencies.jar
164+
MAINCLASS=cryptator.Cryptator
165+
166+
MAINARGS=`cat $1 | xargs`
167+
168+
## exclude cryptarithm with long words
169+
## grep -wvE '\w{10,}' $2 | sed 's/[[:space:]]//g' | xargs java -server -Xms512m -Xmx8192m -cp $JAR $MAINCLASS $MAINARGS
170+
171+
## exclude cryptarithm without long words
172+
## grep -wE '\w{10,}' $2 | sed 's/[[:space:]]//g' | xargs java -server -Xms512m -Xmx8192m -cp $JAR $MAINCLASS $MAINARGS
173+
174+
## Do not exclude anything
175+
sed 's/[[:space:]]//g' $2 | xargs java -server -Xms512m -Xmx8192m -cp $JAR $MAINCLASS $MAINARGS
176+
exit $?
151177
#+END_SRC
152178

153179
** Configure instances

src/main/benchmarks/solver-generate-and-solve.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/main/benchmarks/solver-generate.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/benchmarks/solver-solve.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)