Add scen files

OmriKaduri · Dec 20, 2019 · 22211d7 · 22211d7
1 parent e30ca12
commit 22211d7
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +0,0 @@
-bin/Debug/scen
-bin/Release/scen

diff --git a/.vs/mapf/v15/.suo b/.vs/mapf/v15/.suo
diff --git a/.vs/mapf/v15/Server/sqlite3/storage.ide-wal b/.vs/mapf/v15/Server/sqlite3/storage.ide-wal
diff --git a/Run.cs b/Run.cs
@@ -596,11 +596,11 @@ public Run()
             // MA - CBS - Global - 10 / (EPEA */ SIC) choosing the first conflict in CBS nodes
             //solvers.Add(new CBS(astar, epea, 10));
 
-            //// ICTS + ID 
-            //solvers.Add(new IndependenceDetection(astar, new CostTreeSearchSolverOldMatching(3),true));
+            // ICTS + ID+AS 
+            solvers.Add(new IndependenceDetection(astar, new CostTreeSearchSolverOldMatching(3),true));
 
-            //// EPEA* + ID
-            //solvers.Add(new IndependenceDetection(astar, epea,true));
+            // EPEA* + ID+AS
+            solvers.Add(new IndependenceDetection(astar, epea,true));
 
             // ICTS + ID 
             solvers.Add(new IndependenceDetection(astar, new CostTreeSearchSolverOldMatching(3)));

diff --git a/bin/Debug/mapf.exe b/bin/Debug/mapf.exe
diff --git a/bin/Debug/mapf.pdb b/bin/Debug/mapf.pdb
diff --git a/obj/Debug/mapf.exe b/obj/Debug/mapf.exe
diff --git a/obj/Debug/mapf.pdb b/obj/Debug/mapf.pdb