diff --git a/resolver/Makefile b/resolver/Makefile index 635597effd19044da3eb1dc80927b6d03dcfe1b4..7ac0df06caf693e4734fd90b21e418a326f48913 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 d77e103a78009a35d3c2a56c507b4bb84d6a93de..2745dea3e9b8e445809952334b09c271fcdd1198 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)