Changeset 77

Timestamp:

11/27/06 23:59:54 (2 years ago)

Author:

t

Message:

literal C++ translation of nway.py ;)

Files:

• trunk/paircomp/lib/Makefile (modified) (1 diff)
• trunk/paircomp/lib/Makefile.deps (modified) (1 diff)
• trunk/paircomp/lib/NwayComparison.cc (added)
• trunk/paircomp/lib/NwayComparison.hh (added)
• trunk/paircomp/tests/nway.py (modified) (3 diffs)

trunk/paircomp/lib/Makefile

@@ -12 +12 @@
-
-COMMON_OBJS=MutableComparison.o ImmutableComparison.o \
-
+ NwayComparison.o
-
-libpaircomp.a: $(COMMON_OBJS)

trunk/paircomp/lib/Makefile.deps

@@ -23 +23 @@
-MutableComparison.o: MutableComparison.hh Match.hh /usr/include/assert.h
-MutableComparison.o: Comparison.hh
+NwayComparison.o: NwayComparison.hh ImmutableComparison.hh Comparison.hh
+NwayComparison.o: MutableComparison.hh Match.hh /usr/include/assert.h
+NwayComparison.o: /usr/include/features.h /usr/include/sys/cdefs.h
+NwayComparison.o: /usr/include/gnu/stubs.h
-algorithms.o: /usr/include/ctype.h /usr/include/features.h
-algorithms.o: /usr/include/sys/cdefs.h /usr/include/gnu/stubs.h

trunk/paircomp/tests/nway.py

@@ -149 +149 @@
-            o = o * path[i].orient
-
+        if o == -1:
+            bot_pos = int(bot_pos) + self.windowsize - 1
+
-        # retrieve the actual comparison & matches
-        cmp = self.cmps[from_seq][to_seq]
@@ -157 +160 @@
-        for m in matches:
-            bot = m.bot
-
-            # correct for orientation
-            if o == -1:
-                bot = bot - self.windowsize + 1
-
-            # if we find one, we're golden!
@@ -318 +317 @@
-        assert p == p2
-
+    if run_all:
+        print 'ran all tests'
+
-if __name__ == '__main__':
-    test()