Tiny tweaks to code.

rec · Aug 2, 2015 · 0ee96f5 · 0ee96f5
1 parent 62df0fe
commit 0ee96f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/code/cpp/echomesh/color/Combine.h b/code/cpp/echomesh/color/Combine.h
@@ -11,13 +11,20 @@ class FColor;
 class FColorList;
 
 typedef void (*CombinerFunction)(FColor const&, FColor&);
+using ColumnList = vector<int>;
 
 enum class Combiner { XOR, ADD, SUBTRACT, MULTIPLY, DIVIDE, MIN, MAX, AND, OR };
 
 using FColorListList = vector <FColorList*>;
 
 FColorList combine(FColorListList const&, Combiner);
 FColorList combine(FColorListList const&, CombinerFunction);
+
+/** Not yet implemented. */
+FColorList combine(FColorListList const&, ColumnList const& columns,
+                   CombinerFunction);
+
+
 CombinerFunction getCombinerFunction(string const&);
 string combinerNames();
 

diff --git a/code/python/echomesh/util/TestCase.py b/code/python/echomesh/util/TestCase.py
@@ -19,3 +19,5 @@ def assertNear(self, x, y, msg=None):
             self.assertEquals(lx, ly)
             for xi, yi in zip(x, y):
                 self.assertNear(xi, yi, msg)
+
+main = unittest.main