From 34fa1811952406eb375ef428eb4d6cf8d8986142 Mon Sep 17 00:00:00 2001 From: Tom Date: Mon, 5 Aug 2019 21:13:13 +0200 Subject: [PATCH] added local scons --- .gitmodules | 3 +++ SconsLocal | 1 + util/SAT2QUBO.py | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 SconsLocal diff --git a/.gitmodules b/.gitmodules index 0fe9420..d410764 100644 --- a/.gitmodules +++ b/.gitmodules @@ -15,3 +15,6 @@ path = contrib/qubosolver/qbscxx url = ssh://git@sargas.org:2240/Tom/qbscxx.git branch = develop +[submodule "SconsLocal"] + path = SconsLocal + url = http://sargas.org:3000/Tom/SconsLocal.git diff --git a/SconsLocal b/SconsLocal new file mode 160000 index 0000000..46da7f9 --- /dev/null +++ b/SconsLocal @@ -0,0 +1 @@ +Subproject commit 46da7f94841216958b2684773e787a5076b7bc2d diff --git a/util/SAT2QUBO.py b/util/SAT2QUBO.py index 613dc3d..fb39e5d 100644 --- a/util/SAT2QUBO.py +++ b/util/SAT2QUBO.py @@ -6,13 +6,13 @@ from tqdm import tqdm import math import random -#__VERTEX_WEIGHT__ = -2 -#__EDGE_WEIGHT__ = 2 +__VERTEX_WEIGHT__ = -2 +__EDGE_WEIGHT__ = 2 -__VERTEX_WEIGHT__ = 1 -__EDGE_WEIGHT__ = -2 def WMISdictQUBO(kSATInstance): + __VERTEX_WEIGHT__ = -1 + quboInstance = {} for clauseIndex in range(kSATInstance.getNumberOfClauses()):