From c4e6ebd65b8712185981ece4676b1072a37f87c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Hu=C5=A1ek?= <PitelVonSacek@gmail.com>
Date: Thu, 10 Dec 2015 12:50:50 +0100
Subject: [PATCH] Turn on 2-cut optimization
---
compileTimeOptions.h | 4 ++--
groupConnectivity.pyx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/compileTimeOptions.h b/compileTimeOptions.h
index 10fa76a..4b32d85 100644
--- a/compileTimeOptions.h
+++ b/compileTimeOptions.h
@@ -14,9 +14,9 @@ BOOL_OPTION(OPTIMIZE_COMBINE, 0)
BOOL_OPTION(USE_NEXT_FORB, 1)
-BOOL_OPTION(EXPLICIT_NORMAL_EDGES, 0)
+BOOL_OPTION(EXPLICIT_NORMAL_EDGES, 1)
REQUIRES(EXPLICIT_NORMAL_EDGES, USE_NEXT_FORB)
-BOOL_OPTION(USE_TWO_CUTS, 0)
+BOOL_OPTION(USE_TWO_CUTS, 1)
REQUIRES(USE_TWO_CUTS, USE_NEXT_FORB && EXPLICIT_NORMAL_EDGES)
diff --git a/groupConnectivity.pyx b/groupConnectivity.pyx
index 083bd12..356f3ed 100644
--- a/groupConnectivity.pyx
+++ b/groupConnectivity.pyx
@@ -38,7 +38,7 @@ def pathToEdges(G, path):
def testGroupConnectivity(G, group = "Z4", getClasses = False,
- useTwoCuts = False, debug = False):
+ useTwoCuts = True, debug = False):
cdef AbstractTester* tester = NULL
if group == "Z4":
tester = new Tester[Z4[int]]()
--
GitLab