Update samples

codedot · codedot · commit 9521b3ad302a · 2017-10-31T20:03:48.000+02:00
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ this is the default algorithm;
 by Ian Mackie;
 
 * `optimal`, an implementation of
-[_Lambdascope_][5] by Vincent van Oostrom et al;
+[_Lambdascope_][5] by Vincent van Oostrom et al.
 
 The embedded read-back mechanism is described
 in Section 7 of [10.4204/EPTCS.225.7][4].
@@ -39,14 +39,16 @@ The following is output of the `test.sh` script provided in the package:
 SAMPLE          ABSTRACT         CLOSED        OPTIMAL
 counter             27/4           58/6          143/4
 w2eta               37/7         137/16          205/7
-22210ii           731/70       1740/182        7886/70
-3222ii           1182/43       5896/545      164197/43
-1022ii           4298/59     23026/2085     2489461/59
-4222ii         262401/64 1442259/131124            N/A
-222210ii     2359812/201 6685119/655415            N/A
-cfact4          3711/691      15506/887      56890/691
+1021              173/45     11747/1058      717218/45
+22210i            728/69       1719/181        7826/69
+3222i            1179/42       5635/544      163882/42
+1022i            4295/58     21997/2084     2488384/58
+4222i          262398/63 1376718/131123            N/A
+222210i      2359809/200 6619578/655414            N/A
+2222101   4719108/590024            N/A            N/A
+cfact4          3715/692      15560/888      56928/692
 yfact4          4168/760     24150/1741     526971/760
-cfact5       69147/13462   799868/16170  3074471/13462
+cfact5       69151/13463   799931/16171  3074509/13463
 yfact5       69780/13550   857864/22267            N/A
 ```
 
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
 	"repository": "codedot/lambda",
 	"name": "@alexo/lambda",
 	"bin": "./lambda.js",
-	"version": "0.2.6",
+	"version": "0.2.7",
 	"license": "MIT",
 	"dependencies": {
 		"inet-lib": "0.2.5",
diff --git a/samples/1021.mlc b/samples/1021.mlc
@@ -0,0 +1 @@
+C10 C2 C1
diff --git a/samples/1022i.mlc b/samples/1022i.mlc
@@ -0,0 +1 @@
+C10 C2 C2 I
diff --git a/samples/1022ii.mlc b/samples/1022ii.mlc
diff --git a/samples/22210i.mlc b/samples/22210i.mlc
@@ -0,0 +1 @@
+C2 C2 C2 C10 I
diff --git a/samples/22210ii.mlc b/samples/22210ii.mlc
diff --git a/samples/2222101.mlc b/samples/2222101.mlc
@@ -0,0 +1 @@
+C2 C2 C2 C2 C10 C1
diff --git a/samples/222210i.mlc b/samples/222210i.mlc
@@ -0,0 +1 @@
+C2 C2 C2 C2 C10 I
diff --git a/samples/222210ii.mlc b/samples/222210ii.mlc
diff --git a/samples/3222i.mlc b/samples/3222i.mlc
@@ -0,0 +1 @@
+C3 C2 C2 C2 I
diff --git a/samples/3222ii.mlc b/samples/3222ii.mlc
diff --git a/samples/4222i.mlc b/samples/4222i.mlc
@@ -0,0 +1 @@
+C4 C2 C2 C2 I
diff --git a/samples/4222ii.mlc b/samples/4222ii.mlc
diff --git a/samples/cfact4.mlc b/samples/cfact4.mlc
@@ -1,3 +1,3 @@
-FACT = n: n (p, q: MULT q (p (SUCC q))) (p: C1) C1;
+FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
 
 MINUS (C3 C3) (FACT C4)
diff --git a/samples/cfact5.mlc b/samples/cfact5.mlc
@@ -1,3 +1,3 @@
-FACT = n: n (p, q: MULT q (p (SUCC q))) (p: C1) C1;
+FACT = n: n (p, q: MULT q (p (SUCC q))) (K C1) C1;
 
 MINUS (C3 C5) (FACT C5)
diff --git a/test.sh b/test.sh
@@ -39,21 +39,27 @@ compare counter "v1: v1 (v2: v2 v2) (v3: v3 v3)" \
 compare w2eta "v1, v2: v1 (v1 (v1 (v1 v2)))" \
 	abstract closed optimal
 
-compare 22210ii "v1: v1" \
+compare 1021 "v1: v1" \
 	abstract closed optimal
 
-compare 3222ii "v1: v1" \
+compare 22210i "v1: v1" \
 	abstract closed optimal
 
-compare 1022ii "v1: v1" \
+compare 3222i "v1: v1" \
 	abstract closed optimal
 
-compare 4222ii "v1: v1" \
+compare 1022i "v1: v1" \
+	abstract closed optimal
+
+compare 4222i "v1: v1" \
 	abstract closed OPTIMAL
 
-compare 222210ii "v1: v1" \
+compare 222210i "v1: v1" \
 	abstract closed OPTIMAL
 
+compare 2222101 "v1: v1" \
+	abstract CLOSED OPTIMAL
+
 compare cfact4 "v1, v2: v1 (v1 (v1 v2))" \
 	abstract closed optimal
 
