]>
matita.cs.unibo.it Git - fireball-separation.git/log
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
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
(cherry picked from commit
8a90160900bb95133b8e204a4fcadaa2db2f11dd )
acondolu [Sun, 16 Jul 2017 13:41:16 +0000 (15:41 +0200)]
Printing now preserves the names of the original free variables
(cherry picked from commit
7051416c234181eaf79dedfd18005cdf0a3e0863 )
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
(cherry picked from commit
2d56686ea25883e77d0a69f1245e6e840fc8be5f )
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
(cherry picked from commit
137e2373f8875992898f8be0e07c4299ffbf3516 )
acondolu [Sat, 15 Jul 2017 15:16:51 +0000 (17:16 +0200)]
Added problem wrongly backtracking
(cherry picked from commit
a34071ed728b8de44b198de4e73a52207557ed81 )
acondolu [Sat, 15 Jul 2017 15:00:04 +0000 (17:00 +0200)]
Forgot one "Z"
(cherry picked from commit
572c25c8db51bd571c7f4810500074bac8c37c31 )
acondolu [Sat, 15 Jul 2017 14:47:50 +0000 (16:47 +0200)]
Code clean-up
(cherry picked from commit
8fcb433208ce608350ea554dd1d92fa5a45fd463 )
acondolu [Sat, 15 Jul 2017 14:41:53 +0000 (16:41 +0200)]
Code clean-up
(cherry picked from commit
5d8249a042beefbe21bfeed48619ed1917ebbcb7 )
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
(cherry picked from commit
82dd1911598932af386c4de46398624453e1fc31 )
acondolu [Sat, 15 Jul 2017 14:01:36 +0000 (16:01 +0200)]
Moved all problems in problems folder. Last ones in "w"
(cherry picked from commit
f7a60345135a4032bf63a7dc650bcc9fe30aa30a )
acondolu [Sat, 15 Jul 2017 13:31:04 +0000 (15:31 +0200)]
Fixes to parser
(cherry picked from commit
666a228779e465d08a0deea2e35c0cccf5722b40 )
acondolu [Sat, 15 Jul 2017 13:05:34 +0000 (15:05 +0200)]
Fixed "$" in parser
(cherry picked from commit
db562ac015ffc6c1a08c226b4eef7790b21661cd )
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
(cherry picked from commit
dfad242808c3525a0d9e3420565551964fcf0832 )
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 '?'
(cherry picked from commit
71f8eb7befd85ff4911658136597b41ed177ff8c )
acondolu [Fri, 14 Jul 2017 18:30:55 +0000 (20:30 +0200)]
Added label to problem
(cherry picked from commit
c7e39970b94c93db45f2629af3fdb1e08371eca1 )
acondolu [Fri, 14 Jul 2017 17:39:21 +0000 (19:39 +0200)]
Failure in case of empty problem, to be fixed
(cherry picked from commit
605ae9159149e42a17f044bbfad94f7dc2de79c2 )
acondolu [Fri, 14 Jul 2017 17:28:29 +0000 (19:28 +0200)]
Parser.from_file, and p* problems moved to problems/p
(cherry picked from commit
032edbca0cd6654adae5b5f06620723e74847435 )
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
(cherry picked from commit
15c305b0d106b39616bdeea9aec9febc7539c2c1 )
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
(cherry picked from commit
8b69a4c59242b64294c7065a4e85437ce3cbc32d )
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
(cherry picked from commit
608c40045f651c6402b17c437f997de4d63f6afd )
acondolu [Fri, 14 Jul 2017 14:44:15 +0000 (16:44 +0200)]
Moved parse' from Num to Parser
(cherry picked from commit
123d64bb5ae7127f6a51cbf44b63341de001a187 )
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)
(cherry picked from commit
79e9bd64d15490dd5abc353cc5b09378d3c640d1 )
acondolu [Fri, 14 Jul 2017 12:38:08 +0000 (14:38 +0200)]
Re-use Util.index_of
(cherry picked from commit
52947a60467ebb10cec57ffc1725644ad605c671 )
acondolu [Fri, 14 Jul 2017 12:31:30 +0000 (14:31 +0200)]
Code clean-up
Less casts and casts in the right place
(cherry picked from commit
6bf723ba426a04a3ae5d36baf8a9fe4bffebc635 )
acondolu [Fri, 14 Jul 2017 08:57:22 +0000 (10:57 +0200)]
Tidying up problems.ml
(cherry picked from commit
c8d9c2fda6b135b29e81e3bea95520ba449b86e3 )
acondolu [Thu, 13 Jul 2017 15:38:23 +0000 (17:38 +0200)]
Tentative commit: tactics dropped and clean-up
(cherry picked from commit
0991fc5486c3158fc361e84cbba5aefa67893ba4 )
Include codice di pure.ml che implementa Pure.B da commit
"Removed bomb variable"
acondolu [Thu, 13 Jul 2017 18:35:37 +0000 (20:35 +0200)]
Added assert false
(cherry picked from commit
ba6f0ecd9531b266361674d76423c24381dc72ee )
acondolu [Thu, 13 Jul 2017 18:35:10 +0000 (20:35 +0200)]
Fixed bug in eta_subterm
(cherry picked from commit
09ecd6ebdb7d96386bd79a7117930aba4635f778 )
acondolu [Thu, 13 Jul 2017 18:34:50 +0000 (20:34 +0200)]
Remove FORCE option in Makefile
(cherry picked from commit
6ba14f58fa4c8f93fc2a398bdee030cd2217adea )
acondolu [Thu, 13 Jul 2017 17:05:39 +0000 (19:05 +0200)]
Fix: missing check to avoid stepping on vars of non positive arity
(cherry picked from commit
58f1518398346a81ccd8d0b14a14565b8bff5276 )
acondolu [Thu, 13 Jul 2017 15:34:12 +0000 (17:34 +0200)]
Fix: max_arity_tms was using wrong comparison
(cherry picked from commit
a104858f2dd754e5d086c3884823f3f39d716691 )
acondolu [Mon, 28 May 2018 08:56:07 +0000 (10:56 +0200)]
Added variable convergent_dummy
acondolu [Wed, 12 Jul 2017 21:28:46 +0000 (23:28 +0200)]
Fixes to printing
(cherry picked from commit
4627d2b89b5a96e09b1921e033a5c1d7dd50dbc6 )
acondolu [Wed, 12 Jul 2017 21:12:44 +0000 (23:12 +0200)]
Disabled some chars as variable names in the parser
(cherry picked from commit
bfd8f8a98a7392ac8cbd9070a8e4ff4d06e09510 )
acondolu [Wed, 12 Jul 2017 19:48:01 +0000 (21:48 +0200)]
Prettier-printing: string_of_problem outputs OCaml code
(cherry picked from commit
d97b1a852472085bf3449e34f3b25aee349686fd )
acondolu [Tue, 11 Jul 2017 15:40:00 +0000 (17:40 +0200)]
Fixed if-then-else
(cherry picked from commit
588a00cd5ae861a2f366df992f758f285265a34a )
acondolu [Tue, 11 Jul 2017 15:39:37 +0000 (17:39 +0200)]
Fix: nested `Lambda(false,_) were not handled correctly
(cherry picked from commit
0147bacbe2db4055ae6f991aaa64a9fb1047edc6 )
acondolu [Tue, 11 Jul 2017 15:38:14 +0000 (17:38 +0200)]
-666 -> min_int
(cherry picked from commit
5da7cf1322998c8965455264249f12ac4400f49d )
acondolu [Tue, 11 Jul 2017 14:38:26 +0000 (16:38 +0200)]
Fixed indentation and logging
(cherry picked from commit
4985769db038aa060b47ab40f673aaaacea54742 )
acondolu [Tue, 11 Jul 2017 13:44:40 +0000 (15:44 +0200)]
clean removes *.o files
acondolu [Tue, 11 Jul 2017 13:44:16 +0000 (15:44 +0200)]
Removed old .ar files
acondolu [Tue, 11 Jul 2017 13:42:09 +0000 (15:42 +0200)]
Run tests with: make run
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.
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
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.
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
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
acondolu [Mon, 10 Jul 2017 13:48:25 +0000 (15:48 +0200)]
Experimenting with a combined measure
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
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.
acondolu [Mon, 10 Jul 2017 12:06:55 +0000 (14:06 +0200)]
new_arity = old_arity + 1
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
acondolu [Wed, 28 Jun 2017 14:29:21 +0000 (16:29 +0200)]
Minor fixes
<andrea.condoluci@unibo.it> [Tue, 27 Jun 2017 13:16:43 +0000 (15:16 +0200)]
still stepping on negative variables
<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
<andrea.condoluci@unibo.it> [Mon, 26 Jun 2017 10:26:43 +0000 (12:26 +0200)]
New representation of arities in variables
<andrea.condoluci@unibo.it> [Mon, 26 Jun 2017 09:37:07 +0000 (11:37 +0200)]
Removed traces of lambda3
<andrea.condoluci@unibo.it> [Thu, 22 Jun 2017 15:20:55 +0000 (17:20 +0200)]
Removed lambda3 + Fixed lambda4
<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
<andrea.condoluci@unibo.it> [Mon, 12 Jun 2017 20:44:12 +0000 (22:44 +0200)]
Moved andrea's stuff to its branch
<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
Andrea Condoluci [Mon, 12 Jun 2017 20:17:57 +0000 (22:17 +0200)]
Initial commit