From b7744d9aa4a55ebb96e66c1301840200f0ed5eca Mon Sep 17 00:00:00 2001
From: Tawada <tawada@togawa.cs.waseda.ac.jp>
Date: Thu, 23 Aug 2018 17:51:26 +0900
Subject: [PATCH] Update

---
 resolver/Makefile    | 5 ++++-
 resolver/resolver.py | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/resolver/Makefile b/resolver/Makefile
index 635597e..7ac0df0 100644
--- a/resolver/Makefile
+++ b/resolver/Makefile
@@ -5,7 +5,7 @@ CXX = g++
 CXXFLAGS = -Wall -O3
 PYTHON = python3
 
-.PHONY:run 
+.PHONY:run all test clean
 run:
 	$(PYTHON) $(TARGET).py -i dataAsample.txt
 
@@ -14,6 +14,9 @@ all: $(TARGET)
 $(TARGET): $(OBJS)
 	$(CXX) -o $@ $(OBJS)
 
+test:
+	for i in `seq 1 34`; do $(PYTHON) $(TARGET).py -i `printf "../ADC2017_Q_A/all/A/A%02d.txt" $$i` -o `printf "A_R%02d.txt" $$i`; done
+
 clean:
 	rm *.o
 	rm $(TARGET)
diff --git a/resolver/resolver.py b/resolver/resolver.py
index d77e103..2745dea 100644
--- a/resolver/resolver.py
+++ b/resolver/resolver.py
@@ -325,7 +325,7 @@ class MAP:
 
     def optimize(self):
         #ライン数の10倍の回数だけ「線の引き剥がし・再配線」を繰り返す.
-        iteration = len(self.line)*10
+        iteration = min(len(self.line)*10,200)
         for i in range(iteration):
             m.optLine(np.random.randint(len(self.line))+1)
 
-- 
2.22.0