Skip to content

Commit

Permalink
post-merge-test-update 1 (there is more to come)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ozgurakgun
ozgurakgun committed Feb 26, 2024
1 parent 2e998c4 commit 8472eea
Show file tree
Hide file tree
Showing 5,346 changed files with 61,171 additions and 20,853 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 0 additions & 6 deletions docs/conjure-help.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,8 @@
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--representations-cuts=STRATEGY</td><td style='padding-left:2ex;'>Strategy for choosing a representation for cuts in 'branching on'.<br />Default value: same as --representations</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--channelling</td><td style='padding-left:2ex;'>Whether to produce channelled models (true by default).<br /></td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--representation-levels</td><td style='padding-left:2ex;'>Whether to use built-in precedence levels when choosing representations. Used to cut down the number of generated models.<br />Default: true</td></tr>
<<<<<<< HEAD
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--unnamed-symmetry-breaking=ITEM</td><td style='padding-left:2ex;'>Level to use for breaking symmetries arising from unnamed types. Options: none / fast-consecutive / fast-allpairs / complete-independently / complete.<br />Default: none</td></tr>
=======
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--follow-model=ITEM</td><td style='padding-left:2ex;'>Provide a Conjure-generated Essence Prime model to be used as a guide during model generation. Conjure will try to imitate the modelling decisions from this file.</td></tr>
>>>>>>> main
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--seed=INT</td><td style='padding-left:2ex;'>Random number generator seed.</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--limit-models=INT</td><td style='padding-left:2ex;'>Maximum number of models to generate.</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--choices=FILE</td><td style='padding-left:2ex;'>Choices to use for -al, either an eprime file (created by --log-choices), or a json file.</td></tr>
Expand Down Expand Up @@ -134,11 +131,8 @@
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--representations-cuts=STRATEGY</td><td style='padding-left:2ex;'>Strategy for choosing a representation for cuts in 'branching on'.<br />Default value: same as --representations</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--channelling</td><td style='padding-left:2ex;'>Whether to produce channelled models (true by default).<br /></td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--representation-levels</td><td style='padding-left:2ex;'>Whether to use built-in precedence levels when choosing representations. Used to cut down the number of generated models.<br />Default: true</td></tr>
<<<<<<< HEAD
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--unnamed-symmetry-breaking=ITEM</td><td style='padding-left:2ex;'>Level to use for breaking symmetries arising from unnamed types. Options: none / fast-consecutive / fast-allpairs / complete-independently / complete.<br />Default: none</td></tr>
=======
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--follow-model=ITEM</td><td style='padding-left:2ex;'>Provide a Conjure-generated Essence Prime model to be used as a guide during model generation. Conjure will try to imitate the modelling decisions from this file.</td></tr>
>>>>>>> main
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--seed=INT</td><td style='padding-left:2ex;'>Random number generator seed.</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--limit-models=INT</td><td style='padding-left:2ex;'>Maximum number of models to generate.</td></tr>
<tr><td style='padding-left:2ex;'>&nbsp;<td style='padding-left:1ex; white-space:nowrap;'>--use-existing-models=FILE</td><td style='padding-left:2ex;'>File names of Essence' models generated beforehand.<br />If given, Conjure skips the modelling phase and uses the existing models for solving.<br />The models should be inside the output directory (See -o).</td></tr>
Expand Down
6 changes: 0 additions & 6 deletions docs/conjure-help.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,13 @@
--representation-levels Whether to use built-in precedence levels when choosing representations.
Used to cut down the number of generated models.
Default: true
<<<<<<< HEAD
--unnamed-symmetry-breaking=ITEM Level to use for breaking symmetries arising from unnamed types.
Options: none / fast-consecutive / fast-allpairs / complete-independently
/ complete.
Default: none
=======
--follow-model=ITEM Provide a Conjure-generated Essence Prime model to be used as a guide
during model generation. Conjure will try to imitate the modelling
decisions from this file.
>>>>>>> main
--seed=INT Random number generator seed.
--limit-models=INT Maximum number of models to generate.
--choices=FILE Choices to use for -al, either an eprime file (created by
Expand Down Expand Up @@ -259,16 +256,13 @@
--representation-levels Whether to use built-in precedence levels when choosing representations.
Used to cut down the number of generated models.
Default: true
<<<<<<< HEAD
--unnamed-symmetry-breaking=ITEM Level to use for breaking symmetries arising from unnamed types.
Options: none / fast-consecutive / fast-allpairs / complete-independently
/ complete.
Default: none
=======
--follow-model=ITEM Provide a Conjure-generated Essence Prime model to be used as a guide
during model generation. Conjure will try to imitate the modelling
decisions from this file.
>>>>>>> main
--seed=INT Random number generator seed.
--limit-models=INT Maximum number of models to generate.
--use-existing-models=FILE File names of Essence' models generated beforehand.
Expand Down
Loading

0 comments on commit 8472eea

Please sign in to comment.