From 80fa8bfc9ed139a0f1ea57427741a6fb25daec1b Mon Sep 17 00:00:00 2001 From: "federico.pecora@gmail.com" Date: Tue, 17 Sep 2013 14:31:03 +0000 Subject: [PATCH] Solved incremental propagation bug in APSPSolver. --F. --- build.gradle | 4 ++-- create-bundle.sh | 3 +++ src/main/java/org/metacsp/time/APSPSolver.java | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 788015e6..a42715d0 100644 --- a/build.gradle +++ b/build.gradle @@ -36,8 +36,8 @@ def getSvnRevision() { } //MetaCSP version -//version = '1.0.' + getSvnRevision() -version = '0.0.0-SNAPSHOT' +version = '1.0.' + getSvnRevision() +//version = '0.0.0-SNAPSHOT' group = 'org.metacsp' //Repos for dependencies diff --git a/create-bundle.sh b/create-bundle.sh index 610f1a7c..d9f8a973 100755 --- a/create-bundle.sh +++ b/create-bundle.sh @@ -2,6 +2,9 @@ pomFiles=`find artifacts/ -name *.pom` jarFiles=`find artifacts/ -name *.jar` ascFiles=`find artifacts/ -name *.asc` +if [ -d "bundleTemp" ]; then + rm -rf bundleTemp +fi mkdir bundleTemp for filename in $pomFiles do diff --git a/src/main/java/org/metacsp/time/APSPSolver.java b/src/main/java/org/metacsp/time/APSPSolver.java index 19becff1..44fbd53e 100644 --- a/src/main/java/org/metacsp/time/APSPSolver.java +++ b/src/main/java/org/metacsp/time/APSPSolver.java @@ -726,12 +726,12 @@ private boolean incrementalDistanceMatrixComputation(int from,int to,Bounds i) { long sum4 = sum(sum3,distance[to][v]); long temp = Math.min(sum2,sum4); if (distance[u][v] > temp) { - long oldD = distance[u][v]; + //long oldD = distance[u][v]; distance[u][v] = temp; if (u == v && distance[u][v] != 0) { - logger.info("==================> Updated distance[" + u + "][" + v + "] from " + oldD + " to " + temp); - //return false; - throw new Error("Found negative cycle in incremental propagation while adding (from,to,i) (" + from + "," + to + "," + i + ")"); + //logger.info("==================> Updated distance[" + u + "][" + v + "] from " + oldD + " to " + temp); + //throw new Error("Found negative cycle in incremental propagation while adding (from,to,i) (" + from + "," + to + "," + i + ")"); + return false; } } }