]> matita.cs.unibo.it Git - fireball-separation.git/log
fireball-separation.git
6 years agoClean-up step function; move code
acondolu [Wed, 30 May 2018 11:49:13 +0000 (13:49 +0200)]
Clean-up step function; move code

6 years agoRemoved pacman
acondolu [Wed, 30 May 2018 11:18:57 +0000 (13:18 +0200)]
Removed pacman

6 years agoClean up
acondolu [Wed, 30 May 2018 10:36:15 +0000 (12:36 +0200)]
Clean up

6 years agoget_subterm_with_head_and_args goes under lambdas
acondolu [Tue, 29 May 2018 09:03:53 +0000 (11:03 +0200)]
get_subterm_with_head_and_args goes under lambdas

6 years agoRemoved useless `isdiv' flag
acondolu [Tue, 29 May 2018 09:03:42 +0000 (11:03 +0200)]
Removed useless `isdiv' flag

6 years agoClean-up to examples. Removed tests.
acondolu [Tue, 29 May 2018 09:03:13 +0000 (11:03 +0200)]
Clean-up to examples. Removed tests.

6 years agoClean-up in :andrea/ocaml
acondolu [Tue, 29 May 2018 08:33:06 +0000 (10:33 +0200)]
Clean-up in :andrea/ocaml

- Removed all lambda4 files
- Removed old versions of andrea

6 years agoRefactoring
acondolu [Wed, 7 Mar 2018 10:56:45 +0000 (11:56 +0100)]
Refactoring

6 years agoFixed bug with x stepping on itself applied to args; refactoring
acondolu [Wed, 7 Mar 2018 10:40:24 +0000 (11:40 +0100)]
Fixed bug with x stepping on itself applied to args; refactoring

6 years agoFixed bug where x occurs as its stepped argument. Is this linear anymore?
acondolu [Tue, 6 Mar 2018 21:11:44 +0000 (22:11 +0100)]
Fixed bug where x occurs as its stepped argument. Is this linear anymore?

6 years agoReviving last algorithm (before Summer 2017), conceptually easy but no measure yet
acondolu [Tue, 6 Mar 2018 17:33:27 +0000 (18:33 +0100)]
Reviving last algorithm (before Summer 2017), conceptually easy but no measure yet

6 years agoCopied old code back in parser, to make andrea8 great again
acondolu [Wed, 26 Jul 2017 09:07:15 +0000 (11:07 +0200)]
Copied old code back in parser, to make andrea8 great again

7 years agoMerge branch 'permutations' into andrea
acondolu [Tue, 25 Jul 2017 09:21:38 +0000 (11:21 +0200)]
Merge branch 'permutations' into andrea

7 years agoImplemented parsing of "nominal" variables (`@`)
acondolu [Tue, 25 Jul 2017 08:21:16 +0000 (10:21 +0200)]
Implemented parsing of "nominal" variables (`@`)

Each occurrence of `@` is parsed as a fresh free variable

7 years agoRemoved num_more_args
acondolu [Tue, 25 Jul 2017 07:59:42 +0000 (09:59 +0200)]
Removed num_more_args

7 years agoFixing the bug when eating triggers the reduction of a match
acondolu [Mon, 24 Jul 2017 15:19:59 +0000 (17:19 +0200)]
Fixing the bug when eating triggers the reduction of a match

7 years agoAdded problem failing because of order of step
acondolu [Mon, 24 Jul 2017 14:18:19 +0000 (16:18 +0200)]
Added problem failing because of order of step

7 years agoTest --with-pac fails if unseparable+uncomplete
acondolu [Mon, 24 Jul 2017 14:17:53 +0000 (16:17 +0200)]
Test --with-pac fails if unseparable+uncomplete

7 years agoAllow comments (#) at the end of terms
acondolu [Mon, 24 Jul 2017 14:15:53 +0000 (16:15 +0200)]
Allow comments (#) at the end of terms

7 years agoLogging options to display measure of single terms in string_of_problem
acondolu [Mon, 24 Jul 2017 14:15:19 +0000 (16:15 +0200)]
Logging options to display measure of single terms in string_of_problem

7 years agoFixed bug in Scott.mk_match when no branches (Fixes problem 1 in solved)
acondolu [Mon, 24 Jul 2017 13:38:50 +0000 (15:38 +0200)]
Fixed bug in Scott.mk_match when no branches (Fixes problem 1 in solved)

7 years agoFixed bug in computing special k
acondolu [Mon, 24 Jul 2017 12:55:31 +0000 (14:55 +0200)]
Fixed bug in computing special k

7 years agoAdded exception Lambda, which may be caught when a conv becomes a lambda
acondolu [Mon, 24 Jul 2017 12:55:04 +0000 (14:55 +0200)]
Added exception Lambda, which may be caught when a conv becomes a lambda

7 years agoAdded very simple generator of tests with bombs/pacmans, run it with --with-pac
acondolu [Mon, 24 Jul 2017 12:44:47 +0000 (14:44 +0200)]
Added very simple generator of tests with bombs/pacmans, run it with --with-pac

7 years agoFixed eta_compare in the case Lam vs. Bot
acondolu [Mon, 24 Jul 2017 11:09:05 +0000 (13:09 +0200)]
Fixed eta_compare in the case Lam vs. Bot

7 years agoRemoved special strategies in choose_step
acondolu [Mon, 24 Jul 2017 12:05:08 +0000 (14:05 +0200)]
Removed special strategies in choose_step

7 years agoBetter error messages in parser
acondolu [Sun, 23 Jul 2017 20:23:34 +0000 (22:23 +0200)]
Better error messages in parser

7 years agoCheck for absence of bombs and pacmans
acondolu [Sun, 23 Jul 2017 20:22:41 +0000 (22:22 +0200)]
Check for absence of bombs and pacmans

7 years agoRevert subst in branches of matches
acondolu [Sun, 23 Jul 2017 07:59:00 +0000 (09:59 +0200)]
Revert subst in branches of matches

Actually, it could be moved in susbt_in_problem,
hence doing it only once (on the deltas), instead
of replacing multiple times like now (useless).

7 years agoCleanup in w, added names, uncommented test for low special_k
acondolu [Sun, 23 Jul 2017 07:31:07 +0000 (09:31 +0200)]
Cleanup in w, added names, uncommented test for low special_k

7 years agoChange to compute_special_k
acondolu [Sat, 22 Jul 2017 22:33:00 +0000 (00:33 +0200)]
Change to compute_special_k

Now the special_k taked into account the number or arguments (arity) of
terms. This solves problem "low special_k" in problems/w

7 years agoComments, fix indentation and
acondolu [Sat, 22 Jul 2017 20:35:44 +0000 (22:35 +0200)]
Comments, fix indentation and

7 years agoRenamed in critical_showstoppers: showstoppers -> inedible (I don't know why)
acondolu [Sat, 22 Jul 2017 19:58:31 +0000 (21:58 +0200)]
Renamed in critical_showstoppers: showstoppers -> inedible (I don't know why)

7 years agoSimplified arity_of, precompute_edible_data, critical_showsteppers
acondolu [Sat, 22 Jul 2017 19:34:23 +0000 (21:34 +0200)]
Simplified arity_of, precompute_edible_data, critical_showsteppers

7 years agoFixed computation of arity for top-level inerts
acondolu [Sat, 22 Jul 2017 19:00:26 +0000 (21:00 +0200)]
Fixed computation of arity for top-level inerts

7 years agoSimplified not-working example
acondolu [Sat, 22 Jul 2017 18:59:55 +0000 (20:59 +0200)]
Simplified not-working example

7 years agoMissing parenthesis fixed
Claudio Sacerdoti Coen [Tue, 18 Jul 2017 15:55:29 +0000 (17:55 +0200)]
Missing parenthesis fixed

7 years agoFailing case found
Claudio Sacerdoti Coen [Tue, 18 Jul 2017 13:38:27 +0000 (15:38 +0200)]
Failing case found

7 years agoHack to reserve var 0 to purify it to BOM removed
Claudio Sacerdoti Coen [Tue, 18 Jul 2017 13:36:56 +0000 (15:36 +0200)]
Hack to reserve var 0 to purify it to BOM removed

7 years agoString ==> Bytes to make recent ocaml compilers happy
Claudio Sacerdoti Coen [Tue, 18 Jul 2017 13:26:48 +0000 (15:26 +0200)]
String ==> Bytes to make recent ocaml compilers happy

7 years agoExtracting solutions of 3-coloring problems
acondolu [Sun, 16 Jul 2017 17:36:19 +0000 (19:36 +0200)]
Extracting solutions of 3-coloring problems

Added sample unsat problems found on the internet

7 years agosubst does not replace anymore in branches of maches
acondolu [Sun, 16 Jul 2017 14:01:21 +0000 (16:01 +0200)]
subst does not replace anymore in branches of maches

It was unnecessary: a match cannot expand to a previous branch

7 years agoCommented out problem, it is (still) failing because div occurs in conv
acondolu [Sun, 16 Jul 2017 13:41:49 +0000 (15:41 +0200)]
Commented out problem, it is (still) failing because div occurs in conv

7 years agoPrinting now preserves the names of the original free variables
acondolu [Sun, 16 Jul 2017 13:41:16 +0000 (15:41 +0200)]
Printing now preserves the names of the original free variables

7 years agoFixed typo in problem
acondolu [Sat, 15 Jul 2017 18:25:07 +0000 (20:25 +0200)]
Fixed typo in problem

7 years agoImproved parsing
acondolu [Sat, 15 Jul 2017 18:23:20 +0000 (20:23 +0200)]
Improved parsing

- removed unused parse'
- fixed bug which was ignoring the first problems in some files

7 years agoImproved pretty-printing
acondolu [Sat, 15 Jul 2017 18:21:39 +0000 (20:21 +0200)]
Improved pretty-printing

- Num does not use print_name anymore
- Original names of free variables are preserved
- bound variables' names start with x

7 years agoAdded problem wrongly backtracking
acondolu [Sat, 15 Jul 2017 15:16:51 +0000 (17:16 +0200)]
Added problem wrongly backtracking

7 years agoForgot one "Z"
acondolu [Sat, 15 Jul 2017 15:00:04 +0000 (17:00 +0200)]
Forgot one "Z"

7 years agoCode clean-up
acondolu [Sat, 15 Jul 2017 14:47:50 +0000 (16:47 +0200)]
Code clean-up

7 years agoCode clean-up
acondolu [Sat, 15 Jul 2017 14:41:53 +0000 (16:41 +0200)]
Code clean-up

7 years agoImportant: added special variable "Z" for zero.
acondolu [Sat, 15 Jul 2017 14:41:39 +0000 (16:41 +0200)]
Important: added special variable "Z" for zero.

- Removed append_zero in Lambda4
- Now tests append "Z" at the end of ps'
- Manually appended "Z" at the end of all problems
- Removed tmp function in Lambda4, renamed to problem_of

7 years agoMoved all problems in problems folder. Last ones in "w"
acondolu [Sat, 15 Jul 2017 14:01:36 +0000 (16:01 +0200)]
Moved all problems in problems folder. Last ones in "w"

7 years agoEncoding of SAT problems and 3-colorability of graphs
acondolu [Sat, 15 Jul 2017 13:31:50 +0000 (15:31 +0200)]
Encoding of SAT problems and 3-colorability of graphs

7 years agoFixes to parser
acondolu [Sat, 15 Jul 2017 13:31:04 +0000 (15:31 +0200)]
Fixes to parser

7 years agoAdded problems encoded from 3-colorability of graphs
acondolu [Sat, 15 Jul 2017 13:05:59 +0000 (15:05 +0200)]
Added problems encoded from 3-colorability of graphs

7 years agoFixed "$" in parser
acondolu [Sat, 15 Jul 2017 13:05:34 +0000 (15:05 +0200)]
Fixed "$" in parser

7 years agoCommand line arguments to ./a.out
acondolu [Fri, 14 Jul 2017 18:34:02 +0000 (20:34 +0200)]
Command line arguments to ./a.out

For example:
 ./a.out problems/*
 ./a.out problems/p

Moved "o"-problems to problems/o

7 years agoFixed problems separator in parser: now it is $
acondolu [Fri, 14 Jul 2017 18:32:20 +0000 (20:32 +0200)]
Fixed problems separator in parser: now it is $

A separable problem's label may start with '!', a not separable's with '?'

7 years agoAdded label to problem
acondolu [Fri, 14 Jul 2017 18:30:55 +0000 (20:30 +0200)]
Added label to problem

7 years agoRemoved invalid problems
acondolu [Fri, 14 Jul 2017 17:39:42 +0000 (19:39 +0200)]
Removed invalid problems

7 years agoFailure in case of empty problem, to be fixed
acondolu [Fri, 14 Jul 2017 17:39:21 +0000 (19:39 +0200)]
Failure in case of empty problem, to be fixed

7 years agoParser.from_file, and p* problems moved to problems/p
acondolu [Fri, 14 Jul 2017 17:28:29 +0000 (19:28 +0200)]
Parser.from_file, and p* problems moved to problems/p

7 years agoproblems now contain a label and the names of the original free variables
acondolu [Fri, 14 Jul 2017 17:25:23 +0000 (19:25 +0200)]
problems now contain a label and the names of the original free variables

7 years agoFirst draft of Parser.problem_of_string
acondolu [Fri, 14 Jul 2017 16:02:19 +0000 (18:02 +0200)]
First draft of Parser.problem_of_string

- problem_of_string should unify old Lambda4.problem_of and Parser.parse'
- Lambda4.problem_of was temporarily factored in problem_of_2
  and problem_of_String_tmp

7 years agoChanged logic of entrypoint in Lambda4
acondolu [Fri, 14 Jul 2017 15:20:42 +0000 (17:20 +0200)]
Changed logic of entrypoint in Lambda4

- removed exception Fail
- added "check",which checks if we are in a subproblem
  of separation on which we know to be complete
- "solve" does not raise particular exceptions anymore,
  and the program raise failure only if there is some bug

7 years agoMoved parse' from Num to Parser
acondolu [Fri, 14 Jul 2017 14:44:15 +0000 (16:44 +0200)]
Moved parse' from Num to Parser

7 years agoFixed: was using compare in place of eta_eq
acondolu [Fri, 14 Jul 2017 12:39:10 +0000 (14:39 +0200)]
Fixed: was using compare in place of eta_eq

in particular, eta_eq ignores arities of variables

there used to be cases of duplicate entries in PS (up to arities of variables)

7 years agoRe-use Util.index_of
acondolu [Fri, 14 Jul 2017 12:38:08 +0000 (14:38 +0200)]
Re-use Util.index_of

7 years agoCode clean-up
acondolu [Fri, 14 Jul 2017 12:31:30 +0000 (14:31 +0200)]
Code clean-up

Less casts and casts in the right place

7 years agoTidying up problems.ml
acondolu [Fri, 14 Jul 2017 08:57:22 +0000 (10:57 +0200)]
Tidying up problems.ml

7 years agoNew failing problem, which shows that we need to change special_k
acondolu [Fri, 14 Jul 2017 08:28:09 +0000 (10:28 +0200)]
New failing problem, which shows that we need to change special_k

7 years agoAdded assert false
acondolu [Thu, 13 Jul 2017 18:35:37 +0000 (20:35 +0200)]
Added assert false

7 years agoFixed bug in eta_subterm
acondolu [Thu, 13 Jul 2017 18:35:10 +0000 (20:35 +0200)]
Fixed bug in eta_subterm

7 years agoRemove FORCE option in Makefile
acondolu [Thu, 13 Jul 2017 18:34:50 +0000 (20:34 +0200)]
Remove FORCE option in Makefile

7 years agoFix: missing check to avoid stepping on vars of non positive arity
acondolu [Thu, 13 Jul 2017 17:05:39 +0000 (19:05 +0200)]
Fix: missing check to avoid stepping on vars of non positive arity

7 years agoMore problems
acondolu [Thu, 13 Jul 2017 16:53:50 +0000 (18:53 +0200)]
More problems

7 years agoreturn type of simplify_match improved (no `Match in output)
acondolu [Thu, 13 Jul 2017 16:52:32 +0000 (18:52 +0200)]
return type of simplify_match improved (no `Match in output)

7 years agoAdded safety check for step on n-th argument with n > 1
acondolu [Thu, 13 Jul 2017 16:24:07 +0000 (18:24 +0200)]
Added safety check for step on n-th argument with n > 1

Avoid stepping on n if there is a div/number that would be turned into
a Lambda

7 years agoImproved error messages
acondolu [Thu, 13 Jul 2017 16:19:33 +0000 (18:19 +0200)]
Improved error messages

7 years agoFailing problems commented out
acondolu [Thu, 13 Jul 2017 16:17:06 +0000 (18:17 +0200)]
Failing problems commented out

7 years agoNew tests
acondolu [Thu, 13 Jul 2017 16:08:35 +0000 (18:08 +0200)]
New tests

7 years agoFix (??): some broken tests with Div = variable used to pass
acondolu [Thu, 13 Jul 2017 16:08:08 +0000 (18:08 +0200)]
Fix (??): some broken tests with Div = variable used to pass

7 years agoTentative commit: tactics dropped and clean-up
acondolu [Thu, 13 Jul 2017 15:38:23 +0000 (17:38 +0200)]
Tentative commit: tactics dropped and clean-up

7 years agoFix: max_arity_tms was using wrong comparison
acondolu [Thu, 13 Jul 2017 15:34:12 +0000 (17:34 +0200)]
Fix: max_arity_tms was using wrong comparison

7 years agoFixed try in aux_conv + Added test in pure for divergence of conv
acondolu [Thu, 13 Jul 2017 09:00:36 +0000 (11:00 +0200)]
Fixed try in aux_conv + Added test in pure for divergence of conv

7 years agoFixes to printing
acondolu [Wed, 12 Jul 2017 21:28:46 +0000 (23:28 +0200)]
Fixes to printing

7 years agoAdded more problems with bombs, all working
acondolu [Wed, 12 Jul 2017 21:23:43 +0000 (23:23 +0200)]
Added more problems with bombs, all working

7 years agoDisabled some chars as variable names in the parser
acondolu [Wed, 12 Jul 2017 21:12:44 +0000 (23:12 +0200)]
Disabled some chars as variable names in the parser

7 years agoRemoved bomb variable
acondolu [Wed, 12 Jul 2017 21:11:54 +0000 (23:11 +0200)]
Removed bomb variable

In Pure:
- Added constructor B to Pure.t
- Added rule corresponding to B (bottom) in Pure.mwhd
In Lambda4:
- Instantiating the bomb now actually uses subst_in_problem
- Two new exceptions: Bottom and Pacman
- Fixed subst_in_problem by making expand_match raise these two exceptions,
  which are caught when tolerated

7 years agoPrettier-printing: string_of_problem outputs OCaml code
acondolu [Wed, 12 Jul 2017 19:48:01 +0000 (21:48 +0200)]
Prettier-printing: string_of_problem outputs OCaml code

7 years agoAdded second problem with bombs and pacmans: it works!
acondolu [Wed, 12 Jul 2017 16:52:57 +0000 (18:52 +0200)]
Added second problem with bombs and pacmans: it works!

7 years agoAdded new (passing) problem with a bomb (o1)
acondolu [Wed, 12 Jul 2017 16:39:03 +0000 (18:39 +0200)]
Added new (passing) problem with a bomb (o1)

7 years agoTowards `Bottom and `Pacman
acondolu [Wed, 12 Jul 2017 15:24:54 +0000 (17:24 +0200)]
Towards `Bottom and `Pacman

1) Num updated to handle them
2) lambda4 compiles: safety conditions for projections hopefully
   implemented; strategy code not changed, therefore it will step over
   bombs and friends

7 years agoandrea7 -> new andrea9
acondolu [Wed, 12 Jul 2017 09:18:36 +0000 (11:18 +0200)]
andrea7 -> new andrea9

- Removed Stuck and Pointer
- Added again bool flag to match entries to recall if coming from div or conv
- branches coming from div may diverge
- branches whose continuation is still a variable are completed

Fixed bug where entries in matches were not counted in all_terms
Still crashing

7 years agoNew: simple backtracking with trail
acondolu [Tue, 11 Jul 2017 16:17:23 +0000 (18:17 +0200)]
New: simple backtracking with trail

auto_instantiate replaced by choose_step and first

7 years agoFixed if-then-else
acondolu [Tue, 11 Jul 2017 15:40:00 +0000 (17:40 +0200)]
Fixed if-then-else

7 years agoFix: nested `Lambda(false,_) were not handled correctly
acondolu [Tue, 11 Jul 2017 15:39:37 +0000 (17:39 +0200)]
Fix: nested `Lambda(false,_) were not handled correctly

7 years ago-666 -> min_int
acondolu [Tue, 11 Jul 2017 15:38:14 +0000 (17:38 +0200)]
-666 -> min_int

7 years agoFixed indentation and logging
acondolu [Tue, 11 Jul 2017 14:38:26 +0000 (16:38 +0200)]
Fixed indentation and logging