]> matita.cs.unibo.it Git - fireball-separation.git/log
fireball-separation.git
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 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

7 years agoinstantiate takes an additional argument which is the number of the argument to the...
acondolu [Tue, 11 Jul 2017 14:36:23 +0000 (16:36 +0200)]
instantiate takes an additional argument which is the number of the argument to the variable on which to step

7 years agoclean removes *.o files
acondolu [Tue, 11 Jul 2017 13:44:40 +0000 (15:44 +0200)]
clean removes *.o files

7 years agoRemoved old .ar files
acondolu [Tue, 11 Jul 2017 13:44:16 +0000 (15:44 +0200)]
Removed old .ar files

7 years agoRun tests with: make run
acondolu [Tue, 11 Jul 2017 13:42:09 +0000 (15:42 +0200)]
Run tests with: make run

7 years agoFix: conv : x:min_int (.... y:1 ...) y was not considered for stepping
acondolu [Tue, 11 Jul 2017 12:00:34 +0000 (14:00 +0200)]
Fix: conv : x:min_int (.... y:1 ...)  y was not considered for stepping

When no other choice is available, step on any >0 variable that occurs in
a conv.

7 years agoNew problems n1, n2 used to debug the problem with dangerous variables fixed in the...
acondolu [Tue, 11 Jul 2017 11:24:09 +0000 (13:24 +0200)]
New problems n1, n2 used to debug the problem with dangerous variables fixed in the last commits

7 years agoBug fix: x (y z) where y was conv_dangerous did not make x so
acondolu [Tue, 11 Jul 2017 11:22:41 +0000 (13:22 +0200)]
Bug fix: x (y z) where y was conv_dangerous did not make x so

Additional fix to last commit: args' where no longer checked for dangerous
variables. Fixed by passing three arguments to dangerous_invert_conv in
place of two.

7 years agoFix bug in dangerous_conv with arity of arguments of matches.
acondolu [Tue, 11 Jul 2017 09:37:18 +0000 (11:37 +0200)]
Fix bug in dangerous_conv with arity of arguments of matches.
Next bug: variable replaced twice

7 years agoThe measure finally works on all problems in problems.ml!
acondolu [Mon, 10 Jul 2017 16:44:31 +0000 (18:44 +0200)]
The measure finally works on all problems in problems.ml!
Added in logs/fail.txt a fragment of a failing problem

7 years agoExperimenting with a combined measure
acondolu [Mon, 10 Jul 2017 13:48:25 +0000 (15:48 +0200)]
Experimenting with a combined measure

7 years agoInstantiate now uses a global initialSpecialK (ignoring the local one)
acondolu [Mon, 10 Jul 2017 12:43:43 +0000 (14:43 +0200)]
Instantiate now uses a global initialSpecialK (ignoring the local one)
This fixes the bug in the previous commit, and makes the problem pass

7 years agoArity inherited only in the case (true, min_int)
acondolu [Mon, 10 Jul 2017 12:13:36 +0000 (14:13 +0200)]
Arity inherited only in the case (true, min_int)
Problem 25 fails because a fake variable becomes
critical step.

7 years agonew_arity = old_arity + 1
acondolu [Mon, 10 Jul 2017 12:06:55 +0000 (14:06 +0200)]
new_arity = old_arity + 1

7 years agoFixes to how arities are assigned and propagated
acondolu [Fri, 7 Jul 2017 17:16:29 +0000 (19:16 +0200)]
Fixes to how arities are assigned and propagated
- added truelam to subst (useless, can be removed)
- TODO: to measure the problem, count the `fake` variables
        which are the ones with arity = min_int

7 years agoMinor fixes
acondolu [Wed, 28 Jun 2017 14:29:21 +0000 (16:29 +0200)]
Minor fixes

7 years agostill stepping on negative variables
<andrea.condoluci@unibo.it> [Tue, 27 Jun 2017 13:16:43 +0000 (15:16 +0200)]
still stepping on negative variables

7 years agoProblems pass, but still missing computation of arities of fresh applicative vars
<andrea.condoluci@unibo.it> [Mon, 26 Jun 2017 11:47:30 +0000 (13:47 +0200)]
Problems pass, but still missing computation of arities of fresh applicative vars

7 years agoNew representation of arities in variables
<andrea.condoluci@unibo.it> [Mon, 26 Jun 2017 10:26:43 +0000 (12:26 +0200)]
New representation of arities in variables

7 years agoRemoved traces of lambda3
<andrea.condoluci@unibo.it> [Mon, 26 Jun 2017 09:37:07 +0000 (11:37 +0200)]
Removed traces of lambda3

7 years agoRemoved lambda3 + Fixed lambda4
<andrea.condoluci@unibo.it> [Thu, 22 Jun 2017 15:20:55 +0000 (17:20 +0200)]
Removed lambda3 + Fixed lambda4

7 years agoUpdated type of terms with arities in lambda and matche
<andrea.condoluci@unibo.it> [Thu, 22 Jun 2017 14:23:21 +0000 (16:23 +0200)]
Updated type of terms with arities in lambda and matche

7 years agoMoved andrea's stuff to its branch
<andrea.condoluci@unibo.it> [Mon, 12 Jun 2017 20:44:12 +0000 (22:44 +0200)]
Moved andrea's stuff to its branch

7 years agoCopy ocaml folder from sacerdot's svn repository, rev 4907
<andrea.condoluci@unibo.it> [Mon, 12 Jun 2017 20:28:38 +0000 (22:28 +0200)]
Copy ocaml folder from sacerdot's svn repository, rev 4907

7 years agoInitial commit
Andrea Condoluci [Mon, 12 Jun 2017 20:17:57 +0000 (22:17 +0200)]
Initial commit