summaryrefslogtreecommitdiff
path: root/Fractran
diff options
context:
space:
mode:
authorJed Barber <jjbarber@y7mail.com>2014-02-07 23:28:06 +1100
committerJed Barber <jjbarber@y7mail.com>2014-02-07 23:28:06 +1100
commit8185bf07227e83d94f534db0d8a6f9e539b6ce34 (patch)
tree2aebae72d8a882dadaf39a9b50b0482ea59332f5 /Fractran
parent7054599bbf955574fad1ae65cf6ab7eb117cfa17 (diff)
Revised example programs to match up to FractranProgram datatype
Diffstat (limited to 'Fractran')
-rw-r--r--Fractran/Example.hs26
1 files changed, 20 insertions, 6 deletions
diff --git a/Fractran/Example.hs b/Fractran/Example.hs
index 3bd7b9f..198074e 100644
--- a/Fractran/Example.hs
+++ b/Fractran/Example.hs
@@ -5,8 +5,17 @@ module Example (
prime10short,
prime10) where
+
+import Parser
+
+
+
+
-- some simple fractran programs
+
+-- these ones need an initial input added of the appropriate form
+
-- input: 2^a * 3^b
-- output: 3^(a+b)
addition :: [(Int,Int)]
@@ -17,16 +26,21 @@ addition = [(3,2)]
multiply :: [(Int,Int)]
multiply = [(13,21), (385,13), (1,7), (3,11), (7,2), (1,3)]
+
+
+
+-- these ones are already in ready to interpret, FractranProgram form
+
-- input: 2
-- output: a sequence containing all prime powers of 2
-prime2 :: [(Int,Int)]
-prime2 = [(17,91), (78,85), (19,51), (23,38), (29,33), (77,29), (95,23), (77,19), (1,17), (11,13), (13,11), (15,14), (15,2), (55,1)]
+prime2 :: FractranProgram
+prime2 = FractranProgram [(17,91), (78,85), (19,51), (23,38), (29,33), (77,29), (95,23), (77,19), (1,17), (11,13), (13,11), (15,14), (15,2), (55,1)] 2
-- input: 10
-- output: a sequence containing all prime powers of 10
-prime10short :: [(Int,Int)]
-prime10short = [(3,11), (847,45), (143,6), (7,3), (10,91), (3,7), (36,325), (1,2), (36,5)]
+prime10short :: FractranProgram
+prime10short = FractranProgram [(3,11), (847,45), (143,6), (7,3), (10,91), (3,7), (36,325), (1,2), (36,5)] 10
-prime10 :: [(Int,Int)]
-prime10 = [(7,3), (99,98), (13,49), (39,35), (36,91), (10,143), (49,13), (7,11), (1,2), (91,1)]
+prime10 :: FractranProgram
+prime10 = FractranProgram [(7,3), (99,98), (13,49), (39,35), (36,91), (10,143), (49,13), (7,11), (1,2), (91,1)] 10