added makefile to gitignore, also fixed assert

WilhelmStein · Jan 14, 2019 · 1823b6a · 1823b6a
1 parent 2638888
commit 1823b6a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .vscode/
 bin/
 data/
+/Makefile
diff --git a/src/statistics.cpp b/src/statistics.cpp
@@ -369,7 +369,7 @@ float RHJ::Statistics::expected_cost
                           rrel = cache.query->relations[predicate.right.operand.rel],
                           rcol = predicate.right.operand.col;
 
-        //assert(lrel != rrel || lcol == rcol);
+        assert(predicate.left.rel != predicate.right.operand.rel || lcol == rcol);
 
         const Statistics lold(clone[lrel][lcol]), rold(clone[rrel][rcol]);