From 1958d786f7c2d669888fd27ced34dc26e0d9eb6d Mon Sep 17 00:00:00 2001
From: Jean-Christophe <jean-christophe.routier@univ-lille.fr>
Date: Wed, 8 Jul 2020 09:33:11 +0200
Subject: [PATCH] dalek example
---
.../scala/org/scadcop/example/DalekSurveillanceSystem.scala | 2 +-
src/main/scala/org/scadcop/util/Main.scala | 4 ++--
.../problem/ObjectiveDalekSurveillanceSystemSpec.scala | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala b/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
index d11548a..eb58ff9 100755
--- a/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
+++ b/src/main/scala/org/scadcop/example/DalekSurveillanceSystem.scala
@@ -79,6 +79,6 @@ object DalekSurveillanceSystem{
val pb = new DCOP(Set(d1, d2, d3, d4, d5), Set(constraint12, constraint13, constraint14, constraint23, constraint25,
constraint34, constraint35, constraint45))
- val assignment : Context = new Context().fix(
+ val initialContext : Context = new Context().fix(
Map(d1-> north, d2 -> north, d3 -> north, d4 -> north, d5 -> north))
}
diff --git a/src/main/scala/org/scadcop/util/Main.scala b/src/main/scala/org/scadcop/util/Main.scala
index 4da83ad..cbab582 100755
--- a/src/main/scala/org/scadcop/util/Main.scala
+++ b/src/main/scala/org/scadcop/util/Main.scala
@@ -9,8 +9,8 @@ import akka.actor.ActorSystem
* Main application to test ScaDCOP on a toy example
*/
object Main extends App {
- import org.scadcop.example.RobeColouringExample._
- //or import org.scadcop.example.DalekSurveillanceSystem._
+ //import org.scadcop.example.RobeColouringExample._
+ import org.scadcop.example.DalekSurveillanceSystem._
//or import org.scadcop.example.ToyExample._
val system = ActorSystem("TestDistributedSolver")
diff --git a/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala b/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
index 89572a2..a547d36 100755
--- a/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
+++ b/src/test/scala/org/scadcop/problem/ObjectiveDalekSurveillanceSystemSpec.scala
@@ -15,8 +15,8 @@ class ObjectiveDalekSurveillanceSystemSpec extends AnyFlatSpec {
"The objective when all the directions are north" should " be 33.0" in {
println(pb)
- println(assignment)
- assert(pb.objective(assignment) ~= 33.00)
+ println(initialContext)
+ assert(pb.objective(initialContext) ~= 33.00)
}
"The objective when all the directions are south" should " be 33.0" in {
--
GitLab