This commit was generated by cvs2svn to compensate for changes in r2656,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/externals/iem/iemmatrix/; revision=2657

2 files changed, 67 insertions, 0 deletions

diff --git a/mtx_matcher.pd b/mtx_matcher.pd
new file mode 100644
index 0000000..c713d4d
--- /dev/null
+++ b/mtx_matcher.pd
@@ -0,0 +1,44 @@
+#N canvas 411 75 586 409 10;
+#X obj 61 120 mtx_distance2;
+#X obj 61 96 t a a;
+#X obj 61 164 t a a;
+#X obj 61 199 mtx_*;
+#X obj 61 245 outlet matched;
+#X obj 171 245 outlet matcher;
+#X obj 147 97 inlet dest;
+#X obj 61 69 inlet source;
+#X text 25 25 both "source" and "dest" must have the same number of
+columns (dimension in feature-space);
+#N canvas 0 0 618 479 mtx_rowpermutate 0;
+#X obj 150 214 t b a;
+#X obj 150 235 mtx;
+#X obj 150 256 mtx_*;
+#X obj 111 192 mtx_pivot -1;
+#X text 17 19 this unfortunately does not guarantee to give as a minimum
+trace of the result!;
+#X obj 150 309 outlet rowpermutator;
+#X obj 111 141 inlet permutans;
+#X connect 0 0 1 0;
+#X connect 0 1 2 1;
+#X connect 1 0 2 0;
+#X connect 2 0 5 0;
+#X connect 3 1 0 0;
+#X connect 3 2 1 1;
+#X connect 6 0 3 0;
+#X restore 61 141 pd mtx_rowpermutate;
+#X text 34 303 this algorithm is _far_ from being perfect! the [mtx_rowpermutate]
+does not really guarantee that the trace of the result is a global
+mimimum \; if it is not \, than the match will be sub-optimal! this
+will be even worse \, if there are several _equal_ (sub)minima in the
+distance-matrix.;
+#X text 158 114 greater distances have an extra penalty (^2) \; is
+this ok?;
+#X connect 0 0 9 0;
+#X connect 1 0 0 0;
+#X connect 1 1 3 1;
+#X connect 2 0 3 0;
+#X connect 2 1 5 0;
+#X connect 3 0 4 0;
+#X connect 6 0 0 1;
+#X connect 7 0 1 0;
+#X connect 9 0 2 0;
diff --git a/mtx_spivot.pd b/mtx_spivot.pd
new file mode 100644
index 0000000..a7d243b
--- /dev/null
+++ b/mtx_spivot.pd
@@ -0,0 +1,23 @@
+#N canvas 254 220 462 354 10;
+#X obj 154 166 t b a;
+#X obj 154 187 mtx;
+#X obj 154 208 mtx_*;
+#X obj 115 78 inlet;
+#X obj 154 290 outlet;
+#X obj 230 291 outlet;
+#X obj 115 115 t a a;
+#X obj 154 268 mtx_*;
+#X obj 154 238 t a a;
+#X obj 115 144 mtx_pivot \$1;
+#X connect 0 0 1 0;
+#X connect 0 1 2 1;
+#X connect 1 0 2 0;
+#X connect 2 0 8 0;
+#X connect 3 0 6 0;
+#X connect 6 0 9 0;
+#X connect 6 1 7 1;
+#X connect 7 0 4 0;
+#X connect 8 0 7 0;
+#X connect 8 1 5 0;
+#X connect 9 1 0 0;
+#X connect 9 2 1 1;