.

svn path=/trunk/abstractions/pureunity/; revision=4360

5 files changed, 96 insertions, 84 deletions

diff --git a/generics/associative-test.pd b/generics/associative-test.pd
index 636f3c3..4e33596 100644
--- a/generics/associative-test.pd
+++ b/generics/associative-test.pd
@@ -7,7 +7,6 @@
 #X text 167 9 This test verifies that (1+2)+3=1+(2+3);
 #X msg 40 34 1 2 3;
 #X obj 40 74 unpack 0 0 0;
-#X obj 40 93 associator \$2;
 #X obj 40 236 outlet;
 #X obj 104 155 loadbang;
 #X obj 104 193 unpack s s s;
@@ -15,24 +14,25 @@
 #X obj 104 174 3times symbol associative \$1 \$2;
 #X obj 40 131 * 2;
 #X obj 40 112 \$1.norm;
-#X obj 126 112 \$1.norm;
+#X obj 147 112 \$1.norm;
+#X obj 40 93 associator \$1 \$2;
 #X connect 0 0 6 0;
 #X connect 1 0 2 0;
 #X connect 2 0 4 0;
-#X connect 2 1 12 1;
-#X connect 4 0 12 0;
+#X connect 2 1 11 1;
+#X connect 4 0 11 0;
 #X connect 6 0 7 0;
-#X connect 7 0 8 0;
-#X connect 7 1 8 1;
-#X connect 7 2 8 2;
-#X connect 8 0 15 0;
-#X connect 8 1 16 0;
-#X connect 10 0 13 0;
-#X connect 11 0 12 3;
-#X connect 11 1 12 4;
-#X connect 11 2 12 5;
-#X connect 12 0 9 0;
-#X connect 13 0 11 0;
-#X connect 14 0 1 0;
-#X connect 15 0 14 0;
-#X connect 16 0 1 1;
+#X connect 7 0 16 0;
+#X connect 7 1 16 1;
+#X connect 7 2 16 2;
+#X connect 9 0 12 0;
+#X connect 10 0 11 3;
+#X connect 10 1 11 4;
+#X connect 10 2 11 5;
+#X connect 11 0 8 0;
+#X connect 12 0 10 0;
+#X connect 13 0 1 0;
+#X connect 14 0 13 0;
+#X connect 15 0 1 1;
+#X connect 16 0 14 0;
+#X connect 16 1 15 0;
diff --git a/generics/commutative-test.pd b/generics/commutative-test.pd
index bb66eeb..3787276 100644
--- a/generics/commutative-test.pd
+++ b/generics/commutative-test.pd
@@ -1,38 +1,45 @@
-#N canvas 380 66 452 322 10;
+#N canvas 555 5 452 322 10;
 #X obj 40 15 inlet bang;
-#X obj 40 79 unpack 0 0;
-#X obj 33 160 /;
+#X obj 101 102 unpack 0 0;
+#X obj 101 183 /;
 #X msg 40 34 1 3;
 #X text 216 9 This test verifies that 1+3=3+1;
-#X obj 33 179 t a a;
-#X obj 33 246 outlet;
+#X obj 101 202 t a a;
+#X obj 101 284 outlet;
 #X text 217 44 with tolerance 0;
-#X obj 33 198 <= 0;
+#X obj 101 221 <= 0;
 #X text 218 23 and 1*3=3*1 and...;
-#X obj 33 103 commutator \$2;
-#X obj 97 165 loadbang;
-#X obj 97 184 3times symbol commutative \$1 \$2;
-#X obj 97 203 unpack s s s;
-#X obj 33 227 pack 0 0 -1 s s s;
-#X obj 33 141 * 2;
-#X obj 33 122 \$1.norm;
-#X obj 119 122 \$1.norm;
+#X obj 165 188 loadbang;
+#X obj 165 207 3times symbol commutative \$1 \$2;
+#X obj 165 226 unpack s s s;
+#X obj 101 250 pack 0 0 -1 s s s;
+#X obj 101 164 * 2;
+#X obj 101 145 \$1.norm;
+#X obj 208 145 \$1.norm;
+#X obj 101 126 commutator \$1 \$2;
+#X obj 41 53 t b l b;
+#X obj 43 95 rtimer;
+#X floatatom 44 125 5 0 0 0 - - -;
 #X connect 0 0 3 0;
-#X connect 1 0 10 0;
-#X connect 1 1 10 1;
+#X connect 1 0 17 0;
+#X connect 1 1 17 1;
 #X connect 2 0 5 0;
-#X connect 3 0 1 0;
+#X connect 3 0 18 0;
 #X connect 5 0 8 0;
-#X connect 5 1 14 1;
-#X connect 8 0 14 0;
-#X connect 10 0 16 0;
-#X connect 10 1 17 0;
+#X connect 5 1 13 1;
+#X connect 8 0 13 0;
+#X connect 10 0 11 0;
 #X connect 11 0 12 0;
-#X connect 12 0 13 0;
-#X connect 13 0 14 3;
-#X connect 13 1 14 4;
-#X connect 13 2 14 5;
-#X connect 14 0 6 0;
-#X connect 15 0 2 0;
-#X connect 16 0 15 0;
-#X connect 17 0 2 1;
+#X connect 12 0 13 3;
+#X connect 12 1 13 4;
+#X connect 12 2 13 5;
+#X connect 13 0 6 0;
+#X connect 14 0 2 0;
+#X connect 15 0 14 0;
+#X connect 16 0 2 1;
+#X connect 17 0 15 0;
+#X connect 17 1 16 0;
+#X connect 18 0 19 1;
+#X connect 18 1 1 0;
+#X connect 18 2 19 0;
+#X connect 19 0 20 0;
diff --git a/generics/distributive-test.pd b/generics/distributive-test.pd
index 6ac0127..96d5407 100644
--- a/generics/distributive-test.pd
+++ b/generics/distributive-test.pd
@@ -13,18 +13,18 @@
 #X obj 101 193 unpack s s s s;
 #X obj 37 217 pack 0 0 -1 s s s s;
 #X obj 37 141 * 2;
-#X obj 37 103 distributor \$2 \$3;
 #X obj 37 122 \$1.norm;
-#X obj 130 122 \$1.norm;
+#X obj 172 122 \$1.norm;
+#X obj 37 103 distributor \$1 \$2 \$3;
 #X connect 0 0 6 0;
 #X connect 1 0 2 0;
 #X connect 2 0 4 0;
 #X connect 2 1 12 1;
 #X connect 4 0 12 0;
 #X connect 6 0 7 0;
-#X connect 7 0 14 0;
-#X connect 7 1 14 1;
-#X connect 7 2 14 2;
+#X connect 7 0 16 0;
+#X connect 7 1 16 1;
+#X connect 7 2 16 2;
 #X connect 9 0 10 0;
 #X connect 10 0 11 0;
 #X connect 11 0 12 3;
@@ -33,7 +33,7 @@
 #X connect 11 3 12 6;
 #X connect 12 0 8 0;
 #X connect 13 0 1 0;
-#X connect 14 0 15 0;
-#X connect 14 1 16 0;
-#X connect 15 0 13 0;
-#X connect 16 0 1 1;
+#X connect 14 0 13 0;
+#X connect 15 0 1 1;
+#X connect 16 0 14 0;
+#X connect 16 1 15 0;
diff --git a/generics/invertible-test.pd b/generics/invertible-test.pd
index 8f80778..8702743 100644
--- a/generics/invertible-test.pd
+++ b/generics/invertible-test.pd
@@ -12,13 +12,13 @@
 #X obj 97 193 unpack s s s s;
 #X obj 33 217 pack 0 0 -1 s s s s;
 #X obj 97 174 4times symbol invertible \$1 \$2 \$3;
-#X obj 33 103 invertor \$2 \$3;
 #X obj 33 141 * 2;
 #X obj 33 122 \$1.norm;
-#X obj 126 122 \$1.norm;
+#X obj 147 123 \$1.norm;
+#X obj 33 103 invertor \$1 \$2 \$3;
 #X connect 0 0 3 0;
-#X connect 1 0 13 0;
-#X connect 1 1 13 1;
+#X connect 1 0 16 0;
+#X connect 1 1 16 1;
 #X connect 2 0 4 0;
 #X connect 3 0 1 0;
 #X connect 4 0 6 0;
@@ -31,8 +31,8 @@
 #X connect 10 3 11 6;
 #X connect 11 0 8 0;
 #X connect 12 0 10 0;
-#X connect 13 0 15 0;
-#X connect 13 1 16 0;
-#X connect 14 0 2 0;
-#X connect 15 0 14 0;
-#X connect 16 0 2 1;
+#X connect 13 0 2 0;
+#X connect 14 0 13 0;
+#X connect 15 0 2 1;
+#X connect 16 0 14 0;
+#X connect 16 1 15 0;
diff --git a/generics/locale/english.tcl b/generics/locale/english.tcl
index 09e3125..d079e21 100644
--- a/generics/locale/english.tcl
+++ b/generics/locale/english.tcl
@@ -18,28 +18,33 @@ say_namespace summary {
   proc pu_say {} {
   }
 
-  pu_say  antireflexive {t  } ""
-  pu_say  antisymmetric {t  } ""
-  pu_say    associative {t  } ""
-  pu_say    commutative {t  } ""
-  pu_say   distributive {t  } ""
-  pu_say    equivalence {t  } ""
-  pu_say     invertible {t  } ""
-  pu_say partialorder   {t  } ""
-  pu_say partialordereq {t  } ""
-  pu_say      reflexive {t  } ""
-  pu_say   totalorder   {t  } ""
-  pu_say   totalordereq {t  } ""
-  pu_say     transitive {t  } ""
-  pu_say     trichotomy {t  } ""
-  pu_say      operator1 {t  } ""
-  pu_say      operator2 {t  } ""
+  pu_say   antireflexive {t  } ""
+  pu_say       reflexive {t  } ""
+
+  pu_say     commutative {t  } ""
+  pu_say anticommutative {t  } ""
+  pu_say   antisymmetric {t  } ""
+
+  pu_say     associative {t  } ""
+  pu_say    distributive {t  } ""
+  pu_say      invertible {t  } ""
+
+  pu_say  partialorder   {t  } "partial order (open)"
+  pu_say  partialordereq {t  } "partial order (closed)"
+  pu_say    totalorder   {t  } "total order (open)"
+  pu_say    totalordereq {t  } "total order (closed)"
+  pu_say     equivalence {t  } "equivalence relation"
+
+  pu_say      transitive {t  } "transitive: "
+  pu_say      trichotomy {t  } "trichotomy: either equal or less or greater"
+  pu_say       operator1 {t  } "1-input operator"
+  pu_say       operator2 {t  } "2-input operator"
 
   say_category cancellators
-  say  associator ""
+  say  associator "(ab)c-a(bc)"
   say  commutator "ab-ba"
-  say distributor ""
-  say    invertor ""
+  say distributor "a&(b^c)-(ab^ac)"
+  say    invertor "ab/b-a"
 
   say_category misc
   say twice ""