Commit d2a3be6d authored by Michael Hanus 's avatar Michael Hanus
Browse files

examples and tools updated

parent c7e261cc
PAKCS: Release Notes PAKCS: Release Notes
==================== ====================
Release notes for PAKCS Version 1.14.0 (October 13, 2015) Release notes for PAKCS Version 1.14.0 (October 20, 2015)
--------------------------------------------------------- ---------------------------------------------------------
Changes to version 1.13.0: Changes to version 1.13.0:
...@@ -12,6 +12,8 @@ Changes to version 1.13.0: ...@@ -12,6 +12,8 @@ Changes to version 1.13.0:
are flexible (instead of rigid as before) on user-defined datatypes. are flexible (instead of rigid as before) on user-defined datatypes.
It still suspends when comparing two variables or It still suspends when comparing two variables or
one variable with a number or character. one variable with a number or character.
* Prelude: operations `(===)` and `(&&>)` removed
* Libraries `meta/AbstractCurry...` removed
Release notes for PAKCS Version 1.13.1 (October 2, 2015) Release notes for PAKCS Version 1.13.1 (October 2, 2015)
......
...@@ -60,56 +60,7 @@ goal2 x ...@@ -60,56 +60,7 @@ goal2 x
{x=2} True {x=2} True
{x=3} True {x=3} True
Loading program "colormap"... Loading program "colormap"...
goal1 l1 l2 l3 l4 goal l1 l2 l3 l4
{l1=Red, l2=Yellow, l3=Green, l4=Red} True
{l1=Red, l2=Yellow, l3=Green, l4=Blue} True
{l1=Red, l2=Yellow, l3=Blue, l4=Red} True
{l1=Red, l2=Yellow, l3=Blue, l4=Green} True
{l1=Red, l2=Green, l3=Yellow, l4=Red} True
{l1=Red, l2=Green, l3=Yellow, l4=Blue} True
{l1=Red, l2=Green, l3=Blue, l4=Red} True
{l1=Red, l2=Green, l3=Blue, l4=Yellow} True
{l1=Red, l2=Blue, l3=Yellow, l4=Red} True
{l1=Red, l2=Blue, l3=Yellow, l4=Green} True
{l1=Red, l2=Blue, l3=Green, l4=Red} True
{l1=Red, l2=Blue, l3=Green, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Green, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Green, l4=Blue} True
{l1=Yellow, l2=Red, l3=Blue, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Blue, l4=Green} True
{l1=Yellow, l2=Green, l3=Red, l4=Yellow} True
{l1=Yellow, l2=Green, l3=Red, l4=Blue} True
{l1=Yellow, l2=Green, l3=Blue, l4=Red} True
{l1=Yellow, l2=Green, l3=Blue, l4=Yellow} True
{l1=Yellow, l2=Blue, l3=Red, l4=Yellow} True
{l1=Yellow, l2=Blue, l3=Red, l4=Green} True
{l1=Yellow, l2=Blue, l3=Green, l4=Red} True
{l1=Yellow, l2=Blue, l3=Green, l4=Yellow} True
{l1=Green, l2=Red, l3=Yellow, l4=Green} True
{l1=Green, l2=Red, l3=Yellow, l4=Blue} True
{l1=Green, l2=Red, l3=Blue, l4=Yellow} True
{l1=Green, l2=Red, l3=Blue, l4=Green} True
{l1=Green, l2=Yellow, l3=Red, l4=Green} True
{l1=Green, l2=Yellow, l3=Red, l4=Blue} True
{l1=Green, l2=Yellow, l3=Blue, l4=Red} True
{l1=Green, l2=Yellow, l3=Blue, l4=Green} True
{l1=Green, l2=Blue, l3=Red, l4=Yellow} True
{l1=Green, l2=Blue, l3=Red, l4=Green} True
{l1=Green, l2=Blue, l3=Yellow, l4=Red} True
{l1=Green, l2=Blue, l3=Yellow, l4=Green} True
{l1=Blue, l2=Red, l3=Yellow, l4=Green} True
{l1=Blue, l2=Red, l3=Yellow, l4=Blue} True
{l1=Blue, l2=Red, l3=Green, l4=Yellow} True
{l1=Blue, l2=Red, l3=Green, l4=Blue} True
{l1=Blue, l2=Yellow, l3=Red, l4=Green} True
{l1=Blue, l2=Yellow, l3=Red, l4=Blue} True
{l1=Blue, l2=Yellow, l3=Green, l4=Red} True
{l1=Blue, l2=Yellow, l3=Green, l4=Blue} True
{l1=Blue, l2=Green, l3=Red, l4=Yellow} True
{l1=Blue, l2=Green, l3=Red, l4=Blue} True
{l1=Blue, l2=Green, l3=Yellow, l4=Red} True
{l1=Blue, l2=Green, l3=Yellow, l4=Blue} True
goal2 l1 l2 l3 l4
{l1=Red, l2=Yellow, l3=Green, l4=Red} True {l1=Red, l2=Yellow, l3=Green, l4=Red} True
{l1=Red, l2=Yellow, l3=Green, l4=Blue} True {l1=Red, l2=Yellow, l3=Green, l4=Blue} True
{l1=Red, l2=Yellow, l3=Blue, l4=Red} True {l1=Red, l2=Yellow, l3=Blue, l4=Red} True
......
...@@ -60,56 +60,7 @@ goal2 x ...@@ -60,56 +60,7 @@ goal2 x
{x=2} True {x=2} True
{x=3} True {x=3} True
Loading program "colormap"... Loading program "colormap"...
goal1 l1 l2 l3 l4 goal l1 l2 l3 l4
{l1=Red, l2=Yellow, l3=Green, l4=Red} True
{l1=Red, l2=Yellow, l3=Green, l4=Blue} True
{l1=Red, l2=Yellow, l3=Blue, l4=Red} True
{l1=Red, l2=Yellow, l3=Blue, l4=Green} True
{l1=Red, l2=Green, l3=Yellow, l4=Red} True
{l1=Red, l2=Green, l3=Yellow, l4=Blue} True
{l1=Red, l2=Green, l3=Blue, l4=Red} True
{l1=Red, l2=Green, l3=Blue, l4=Yellow} True
{l1=Red, l2=Blue, l3=Yellow, l4=Red} True
{l1=Red, l2=Blue, l3=Yellow, l4=Green} True
{l1=Red, l2=Blue, l3=Green, l4=Red} True
{l1=Red, l2=Blue, l3=Green, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Green, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Green, l4=Blue} True
{l1=Yellow, l2=Red, l3=Blue, l4=Yellow} True
{l1=Yellow, l2=Red, l3=Blue, l4=Green} True
{l1=Yellow, l2=Green, l3=Red, l4=Yellow} True
{l1=Yellow, l2=Green, l3=Red, l4=Blue} True
{l1=Yellow, l2=Green, l3=Blue, l4=Red} True
{l1=Yellow, l2=Green, l3=Blue, l4=Yellow} True
{l1=Yellow, l2=Blue, l3=Red, l4=Yellow} True
{l1=Yellow, l2=Blue, l3=Red, l4=Green} True
{l1=Yellow, l2=Blue, l3=Green, l4=Red} True
{l1=Yellow, l2=Blue, l3=Green, l4=Yellow} True
{l1=Green, l2=Red, l3=Yellow, l4=Green} True
{l1=Green, l2=Red, l3=Yellow, l4=Blue} True
{l1=Green, l2=Red, l3=Blue, l4=Yellow} True
{l1=Green, l2=Red, l3=Blue, l4=Green} True
{l1=Green, l2=Yellow, l3=Red, l4=Green} True
{l1=Green, l2=Yellow, l3=Red, l4=Blue} True
{l1=Green, l2=Yellow, l3=Blue, l4=Red} True
{l1=Green, l2=Yellow, l3=Blue, l4=Green} True
{l1=Green, l2=Blue, l3=Red, l4=Yellow} True
{l1=Green, l2=Blue, l3=Red, l4=Green} True
{l1=Green, l2=Blue, l3=Yellow, l4=Red} True
{l1=Green, l2=Blue, l3=Yellow, l4=Green} True
{l1=Blue, l2=Red, l3=Yellow, l4=Green} True
{l1=Blue, l2=Red, l3=Yellow, l4=Blue} True
{l1=Blue, l2=Red, l3=Green, l4=Yellow} True
{l1=Blue, l2=Red, l3=Green, l4=Blue} True
{l1=Blue, l2=Yellow, l3=Red, l4=Green} True
{l1=Blue, l2=Yellow, l3=Red, l4=Blue} True
{l1=Blue, l2=Yellow, l3=Green, l4=Red} True
{l1=Blue, l2=Yellow, l3=Green, l4=Blue} True
{l1=Blue, l2=Green, l3=Red, l4=Yellow} True
{l1=Blue, l2=Green, l3=Red, l4=Blue} True
{l1=Blue, l2=Green, l3=Yellow, l4=Red} True
{l1=Blue, l2=Green, l3=Yellow, l4=Blue} True
goal2 l1 l2 l3 l4
{l1=Red, l2=Yellow, l3=Green, l4=Red} True {l1=Red, l2=Yellow, l3=Green, l4=Red} True
{l1=Red, l2=Yellow, l3=Green, l4=Blue} True {l1=Red, l2=Yellow, l3=Green, l4=Blue} True
{l1=Red, l2=Yellow, l3=Blue, l4=Red} True {l1=Red, l2=Yellow, l3=Blue, l4=Red} True
......
...@@ -42,10 +42,6 @@ correct l1 l2 l3 l4 = l1 /= l2 & l1 /= l3 & l2 /= l3 & l2 /= l4 & l3 /= l4 ...@@ -42,10 +42,6 @@ correct l1 l2 l3 l4 = l1 /= l2 & l1 /= l3 & l2 /= l3 & l2 /= l4 & l3 /= l4
-- generate+test solution: -- generate+test solution:
goal1 l1 l2 l3 l4 = coloring l1 l2 l3 l4 & correct l1 l2 l3 l4 goal l1 l2 l3 l4 = coloring l1 l2 l3 l4 & correct l1 l2 l3 l4
-- test+generate solution:
goal2 l1 l2 l3 l4 = correct l1 l2 l3 l4 & coloring l1 l2 l3 l4
digit :: Int -> Success digit :: Int -> Bool
digit 0 = True
digit 0 = success digit 1 = True
digit 1 = success digit 2 = True
digit 2 = success digit 3 = True
digit 3 = success digit 4 = True
digit 4 = success digit 5 = True
digit 5 = success digit 6 = True
digit 6 = success digit 7 = True
digit 7 = success digit 8 = True
digit 8 = success digit 9 = True
digit 9 = success
-- goals: arithmetic functions as passive constraints: -- goals: arithmetic functions as passive constraints:
goal x y = x+x=:=y & x*x=:=y & digit x goal x y = x+x=:=y & x*x=:=y & digit x
...@@ -14,40 +14,40 @@ ...@@ -14,40 +14,40 @@
data Person = Christine | Maria | Monica | Alice | Susan | data Person = Christine | Maria | Monica | Alice | Susan |
Antony | Bill | John | Frank | Peter | Andrew Antony | Bill | John | Frank | Peter | Andrew
female Christine = success female Christine = True
female Maria = success female Maria = True
female Monica = success female Monica = True
female Alice = success female Alice = True
female Susan = success female Susan = True
male Antony = success male Antony = True
male Bill = success male Bill = True
male John = success male John = True
male Frank = success male Frank = True
male Peter = success male Peter = True
male Andrew = success male Andrew = True
married Christine Antony = success married Christine Antony = True
married Maria Bill = success married Maria Bill = True
married Monica John = success married Monica John = True
married Alice Frank = success married Alice Frank = True
mother Christine John = success mother Christine John = True
mother Christine Alice = success mother Christine Alice = True
mother Maria Frank = success mother Maria Frank = True
mother Monica Susan = success mother Monica Susan = True
mother Monica Peter = success mother Monica Peter = True
mother Alice Andrew = success mother Alice Andrew = True
father f c = let m free in married m f & mother m c father f c | married m f & mother m c = True where m free
grandfather g c = let f free in father g f & father f c grandfather g c | father g f & father f c = True where f free
grandfather g c = let m free in father g m & mother m c grandfather g c | father g m & mother m c = True where m free
-- goals: -- goals:
......
...@@ -38,8 +38,7 @@ goal2 x y where x,y free ...@@ -38,8 +38,7 @@ goal2 x y where x,y free
:l member :l member
goal2 x where x free goal2 x where x free
:l colormap :l colormap
goal1 l1 l2 l3 l4 where l1,l2,l3,l4 free goal l1 l2 l3 l4 where l1,l2,l3,l4 free
goal2 l1 l2 l3 l4 where l1,l2,l3,l4 free
:l account :l account
goal1 b where b free goal1 b where b free
goal2 b where b free goal2 b where b free
......
lib-trunk @ 749c6819
Subproject commit 51d33ceeed11bfdfa534e6bd7947ffb32e348deb Subproject commit 749c68199c2f799c887b98a16cd0bd60834529b7
...@@ -10,11 +10,6 @@ import Char ...@@ -10,11 +10,6 @@ import Char
import Parse import Parse
import ReadShowTerm import ReadShowTerm
infixr 0 &&>
(&&>) :: Bool -> a -> a
b &&> c | b = c
data Json data Json
= Object [(String, Json)] = Object [(String, Json)]
| Array [Json] | Array [Json]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment