From 01a96e05f67d4fcf82d49fb3a26fb32e2ed5410a Mon Sep 17 00:00:00 2001
From: tawada <tawada@togawa.cs.waseda.ac.jp>
Date: Mon, 27 Aug 2018 22:06:35 +0900
Subject: [PATCH] Update

---
 ADC2017_Q_A/all/A/A01.txt | 1 -
 ADC2017_Q_A/all/A/A02.txt | 1 -
 ADC2017_Q_A/all/A/A03.txt | 1 -
 ADC2017_Q_A/all/A/A04.txt | 1 -
 ADC2017_Q_A/all/A/A05.txt | 1 -
 ADC2017_Q_A/all/A/A06.txt | 1 -
 ADC2017_Q_A/all/A/A07.txt | 1 -
 ADC2017_Q_A/all/A/A08.txt | 1 -
 ADC2017_Q_A/all/A/A09.txt | 1 -
 ADC2017_Q_A/all/A/A10.txt | 1 -
 ADC2017_Q_A/all/A/A11.txt | 1 -
 ADC2017_Q_A/all/A/A12.txt | 1 -
 ADC2017_Q_A/all/A/A13.txt | 1 -
 ADC2017_Q_A/all/A/A14.txt | 1 -
 ADC2017_Q_A/all/A/A15.txt | 1 -
 ADC2017_Q_A/all/A/A16.txt | 1 -
 ADC2017_Q_A/all/A/A17.txt | 1 -
 ADC2017_Q_A/all/A/A18.txt | 1 -
 ADC2017_Q_A/all/A/A19.txt | 1 -
 ADC2017_Q_A/all/A/A20.txt | 1 -
 ADC2017_Q_A/all/A/A21.txt | 1 -
 ADC2017_Q_A/all/A/A22.txt | 1 -
 ADC2017_Q_A/all/A/A23.txt | 1 -
 ADC2017_Q_A/all/A/A24.txt | 1 -
 ADC2017_Q_A/all/A/A25.txt | 1 -
 ADC2017_Q_A/all/A/A26.txt | 1 -
 ADC2017_Q_A/all/A/A27.txt | 1 -
 ADC2017_Q_A/all/A/A28.txt | 1 -
 ADC2017_Q_A/all/A/A29.txt | 1 -
 ADC2017_Q_A/all/A/A30.txt | 1 -
 ADC2017_Q_A/all/A/A31.txt | 1 -
 ADC2017_Q_A/all/A/A32.txt | 1 -
 ADC2017_Q_A/all/A/A33.txt | 1 -
 ADC2017_Q_A/all/A/A34.txt | 1 -
 resolver/cpp/Makefile     | 2 +-
 35 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/ADC2017_Q_A/all/A/A01.txt b/ADC2017_Q_A/all/A/A01.txt
index ba6ba9e..9f63e44 100644
--- a/ADC2017_Q_A/all/A/A01.txt
+++ b/ADC2017_Q_A/all/A/A01.txt
@@ -1,4 +1,3 @@
-GET A1
 SIZE 24X24X4
 LAYER 1
 55,32,32,32,32,32,32,32,32,32,32,32,32,32,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A02.txt b/ADC2017_Q_A/all/A/A02.txt
index fa14a32..7a26c8e 100644
--- a/ADC2017_Q_A/all/A/A02.txt
+++ b/ADC2017_Q_A/all/A/A02.txt
@@ -1,4 +1,3 @@
-GET A2
 SIZE 15X15X2
 LAYER 1
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A03.txt b/ADC2017_Q_A/all/A/A03.txt
index 118a0c0..181ac68 100644
--- a/ADC2017_Q_A/all/A/A03.txt
+++ b/ADC2017_Q_A/all/A/A03.txt
@@ -1,4 +1,3 @@
-GET A3
 SIZE 20X20X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A04.txt b/ADC2017_Q_A/all/A/A04.txt
index 2e1b4e6..462d335 100644
--- a/ADC2017_Q_A/all/A/A04.txt
+++ b/ADC2017_Q_A/all/A/A04.txt
@@ -1,4 +1,3 @@
-GET A4
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2
diff --git a/ADC2017_Q_A/all/A/A05.txt b/ADC2017_Q_A/all/A/A05.txt
index 7192332..774ca69 100644
--- a/ADC2017_Q_A/all/A/A05.txt
+++ b/ADC2017_Q_A/all/A/A05.txt
@@ -1,4 +1,3 @@
-GET A5
 SIZE 8X8X4
 LAYER 1
 1,2,2,2,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A06.txt b/ADC2017_Q_A/all/A/A06.txt
index 66d35b9..c4534cf 100644
--- a/ADC2017_Q_A/all/A/A06.txt
+++ b/ADC2017_Q_A/all/A/A06.txt
@@ -1,4 +1,3 @@
-GET A6
 SIZE 48X36X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,27,27,27,27,27,27,27,0,0,55,0,0,0,53,0,0,0,55,0,54,54,78,78,0,0,0,0,0,0,0,0,0,77
diff --git a/ADC2017_Q_A/all/A/A07.txt b/ADC2017_Q_A/all/A/A07.txt
index 6bcf201..197c935 100644
--- a/ADC2017_Q_A/all/A/A07.txt
+++ b/ADC2017_Q_A/all/A/A07.txt
@@ -1,4 +1,3 @@
-GET A7
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A08.txt b/ADC2017_Q_A/all/A/A08.txt
index 2cb3f7d..4251847 100644
--- a/ADC2017_Q_A/all/A/A08.txt
+++ b/ADC2017_Q_A/all/A/A08.txt
@@ -1,4 +1,3 @@
-GET A8
 SIZE 70X70X8
 LAYER 1
 00,00,03,755,755,00,00,00,00,00,00,00,00,00,00,00,00,593,593,593,593,593,593,00,00,00,00,56,56,03,03,03,03,03,03,00,00,72,72,72,00,00,00,00,00,00,00,00,00,422,422,315,00,00,00,802,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A09.txt b/ADC2017_Q_A/all/A/A09.txt
index b2c56d5..31c926d 100644
--- a/ADC2017_Q_A/all/A/A09.txt
+++ b/ADC2017_Q_A/all/A/A09.txt
@@ -1,4 +1,3 @@
-GET A9
 SIZE 15X15X2
 LAYER 1
 30,28,32,32,32,43,43,01,01,01,01,01,01,01,00
diff --git a/ADC2017_Q_A/all/A/A10.txt b/ADC2017_Q_A/all/A/A10.txt
index d3beeff..fdbf2cc 100644
--- a/ADC2017_Q_A/all/A/A10.txt
+++ b/ADC2017_Q_A/all/A/A10.txt
@@ -1,4 +1,3 @@
-GET A10
 SIZE 23X12X6
 LAYER 1
 36,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A11.txt b/ADC2017_Q_A/all/A/A11.txt
index 8d9a274..249d256 100644
--- a/ADC2017_Q_A/all/A/A11.txt
+++ b/ADC2017_Q_A/all/A/A11.txt
@@ -1,4 +1,3 @@
-GET A11
 SIZE 8X4X8
 LAYER 1
 1,2,2,2,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A12.txt b/ADC2017_Q_A/all/A/A12.txt
index 049bf9d..3de0e6e 100644
--- a/ADC2017_Q_A/all/A/A12.txt
+++ b/ADC2017_Q_A/all/A/A12.txt
@@ -1,4 +1,3 @@
-GET A12
 SIZE 36X19X4
 LAYER 1
 10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A13.txt b/ADC2017_Q_A/all/A/A13.txt
index a0af02b..5ea2e4a 100644
--- a/ADC2017_Q_A/all/A/A13.txt
+++ b/ADC2017_Q_A/all/A/A13.txt
@@ -1,4 +1,3 @@
-GET A13
 SIZE 72X72X8
 LAYER 1
 1,0,0,0,0,0,0,0,0,52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A14.txt b/ADC2017_Q_A/all/A/A14.txt
index 5d8d4a9..e87a9e0 100644
--- a/ADC2017_Q_A/all/A/A14.txt
+++ b/ADC2017_Q_A/all/A/A14.txt
@@ -1,4 +1,3 @@
-GET A14
 SIZE 10X10X2
 LAYER 1
 06,06,00,00,04,04,04,04,04,04
diff --git a/ADC2017_Q_A/all/A/A15.txt b/ADC2017_Q_A/all/A/A15.txt
index 5b2e4a7..aa6afbb 100644
--- a/ADC2017_Q_A/all/A/A15.txt
+++ b/ADC2017_Q_A/all/A/A15.txt
@@ -1,4 +1,3 @@
-GET A15
 SIZE 60X36X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A16.txt b/ADC2017_Q_A/all/A/A16.txt
index dcc5221..7c3798c 100644
--- a/ADC2017_Q_A/all/A/A16.txt
+++ b/ADC2017_Q_A/all/A/A16.txt
@@ -1,4 +1,3 @@
-GET A16
 SIZE 15X15X4
 LAYER 1
 0,0,0,0,0,1,23,23,23,62,62,62,0,0,0
diff --git a/ADC2017_Q_A/all/A/A17.txt b/ADC2017_Q_A/all/A/A17.txt
index 662346a..79e6f93 100644
--- a/ADC2017_Q_A/all/A/A17.txt
+++ b/ADC2017_Q_A/all/A/A17.txt
@@ -1,4 +1,3 @@
-GET A17
 SIZE 50X50X4
 LAYER 1
 21,21,485,485,485,485,591,591,180,180,180,180,180,180,180,180,180,180,180,180,180,180,180,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A18.txt b/ADC2017_Q_A/all/A/A18.txt
index 98cef50..7f71dbf 100644
--- a/ADC2017_Q_A/all/A/A18.txt
+++ b/ADC2017_Q_A/all/A/A18.txt
@@ -1,4 +1,3 @@
-GET A18
 SIZE 20X35X8
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A19.txt b/ADC2017_Q_A/all/A/A19.txt
index 0ddd13e..ce52315 100644
--- a/ADC2017_Q_A/all/A/A19.txt
+++ b/ADC2017_Q_A/all/A/A19.txt
@@ -1,4 +1,3 @@
-GET A19
 SIZE 36X24X1
 LAYER 1
 01,01,01,02,02,02,05,05,05,05,05,05,17,17,17,18,18,18,21,21,21,21,21,21,33,33,33,34,34,34,37,37,37,37,37,37
diff --git a/ADC2017_Q_A/all/A/A20.txt b/ADC2017_Q_A/all/A/A20.txt
index 2a564cf..3e08d45 100644
--- a/ADC2017_Q_A/all/A/A20.txt
+++ b/ADC2017_Q_A/all/A/A20.txt
@@ -1,4 +1,3 @@
-GET A20
 SIZE 30X30X3
 LAYER 1
 82,82,82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/ADC2017_Q_A/all/A/A21.txt b/ADC2017_Q_A/all/A/A21.txt
index 93fc218..7d633c9 100644
--- a/ADC2017_Q_A/all/A/A21.txt
+++ b/ADC2017_Q_A/all/A/A21.txt
@@ -1,4 +1,3 @@
-GET A21
 SIZE 72X72X5
 LAYER 1
 01,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,72,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00
diff --git a/ADC2017_Q_A/all/A/A22.txt b/ADC2017_Q_A/all/A/A22.txt
index 43070f9..2474b41 100644
--- a/ADC2017_Q_A/all/A/A22.txt
+++ b/ADC2017_Q_A/all/A/A22.txt
@@ -1,4 +1,3 @@
-GET A22
 SIZE 72X72X2
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2
diff --git a/ADC2017_Q_A/all/A/A23.txt b/ADC2017_Q_A/all/A/A23.txt
index e9956a8..1d74ee1 100644
--- a/ADC2017_Q_A/all/A/A23.txt
+++ b/ADC2017_Q_A/all/A/A23.txt
@@ -1,4 +1,3 @@
-GET A23
 SIZE 40X40X3
 LAYER 1
 01,01,01,01,01,01,01,01,01,26,11,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,04,09,09,09,09,09,09,09
diff --git a/ADC2017_Q_A/all/A/A24.txt b/ADC2017_Q_A/all/A/A24.txt
index 934fa2f..92bb55c 100644
--- a/ADC2017_Q_A/all/A/A24.txt
+++ b/ADC2017_Q_A/all/A/A24.txt
@@ -1,4 +1,3 @@
-GET A24
 SIZE 60X60X4
 LAYER 1
 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,695,00,00,318,318,318,00,00,228,228,228,228,822,00,00,00,00,00,00,00,00,00,00,00,00,00,00,72,72,307,307,00,00,00
diff --git a/ADC2017_Q_A/all/A/A25.txt b/ADC2017_Q_A/all/A/A25.txt
index 9b173bc..f421cc3 100644
--- a/ADC2017_Q_A/all/A/A25.txt
+++ b/ADC2017_Q_A/all/A/A25.txt
@@ -1,4 +1,3 @@
-GET A25
 SIZE 40X40X4
 LAYER 1
 01,01,01,01,01,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,18,17,16,15,14,13,12,11,10,09,08,07,06,05,02
diff --git a/ADC2017_Q_A/all/A/A26.txt b/ADC2017_Q_A/all/A/A26.txt
index 3e00fb7..c8de9bc 100644
--- a/ADC2017_Q_A/all/A/A26.txt
+++ b/ADC2017_Q_A/all/A/A26.txt
@@ -1,4 +1,3 @@
-GET A26
 SIZE 15X15X3
 LAYER 1
 0,0,7,26,0,43,0,0,0,0,0,0,10,0,0
diff --git a/ADC2017_Q_A/all/A/A27.txt b/ADC2017_Q_A/all/A/A27.txt
index 1c03652..a5b60c9 100644
--- a/ADC2017_Q_A/all/A/A27.txt
+++ b/ADC2017_Q_A/all/A/A27.txt
@@ -1,4 +1,3 @@
-GET A27
 SIZE 72X72X8
 LAYER 1
 1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8
diff --git a/ADC2017_Q_A/all/A/A28.txt b/ADC2017_Q_A/all/A/A28.txt
index 6499f89..6f7e317 100644
--- a/ADC2017_Q_A/all/A/A28.txt
+++ b/ADC2017_Q_A/all/A/A28.txt
@@ -1,4 +1,3 @@
-GET A28
 SIZE 3X3X3
 LAYER 1
 1,2,3
diff --git a/ADC2017_Q_A/all/A/A29.txt b/ADC2017_Q_A/all/A/A29.txt
index 9e52f98..7365ae3 100644
--- a/ADC2017_Q_A/all/A/A29.txt
+++ b/ADC2017_Q_A/all/A/A29.txt
@@ -1,4 +1,3 @@
-GET A29
 SIZE 72X72X1
 LAYER 1
 01,01,14,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03,03
diff --git a/ADC2017_Q_A/all/A/A30.txt b/ADC2017_Q_A/all/A/A30.txt
index c5b91ea..eeb8d4b 100644
--- a/ADC2017_Q_A/all/A/A30.txt
+++ b/ADC2017_Q_A/all/A/A30.txt
@@ -1,4 +1,3 @@
-GET A30
 SIZE 72X72X1
 LAYER 1
 01,01,01,01,01,10,10,10,10,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02,02
diff --git a/ADC2017_Q_A/all/A/A31.txt b/ADC2017_Q_A/all/A/A31.txt
index 56fc7d3..bed48a2 100644
--- a/ADC2017_Q_A/all/A/A31.txt
+++ b/ADC2017_Q_A/all/A/A31.txt
@@ -1,4 +1,3 @@
-GET A31
 SIZE 16X20X5
 LAYER 1
 005,022,039,056,073,090,107,124,141,158,175,192,209,226,243,260
diff --git a/ADC2017_Q_A/all/A/A32.txt b/ADC2017_Q_A/all/A/A32.txt
index 0381b20..b641ba6 100644
--- a/ADC2017_Q_A/all/A/A32.txt
+++ b/ADC2017_Q_A/all/A/A32.txt
@@ -1,4 +1,3 @@
-GET A32
 SIZE 40X40X3
 LAYER 1
 0,0,0,0,0,0,0,0,0,0,0,112,112,112,112,112,112,112,112,112,112,112,0,299,0,0,0,130,26,0,0,0,0,0,20,20,20,20,20,20
diff --git a/ADC2017_Q_A/all/A/A33.txt b/ADC2017_Q_A/all/A/A33.txt
index ba28e58..14ccf8c 100644
--- a/ADC2017_Q_A/all/A/A33.txt
+++ b/ADC2017_Q_A/all/A/A33.txt
@@ -1,4 +1,3 @@
-GET A33
 SIZE 40X40X2
 LAYER 1
 01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20,20,19,18,17,16,15,14,13,12,11,10,09,08,07,06,05,04,03,02,01
diff --git a/ADC2017_Q_A/all/A/A34.txt b/ADC2017_Q_A/all/A/A34.txt
index c85d47d..fa90413 100644
--- a/ADC2017_Q_A/all/A/A34.txt
+++ b/ADC2017_Q_A/all/A/A34.txt
@@ -1,4 +1,3 @@
-GET A34
 SIZE 40X40X3
 LAYER 1
 01,41,01,01,01,42,01,01,01,43,01,01,01,44,01,01,01,45,01,01,01,46,01,01,01,47,01,01,01,48,01,01,01,49,01,01,01,50,01,01
diff --git a/resolver/cpp/Makefile b/resolver/cpp/Makefile
index 5f6c134..7c27b60 100644
--- a/resolver/cpp/Makefile
+++ b/resolver/cpp/Makefile
@@ -10,7 +10,7 @@ run: $(TARGET)
 	./$(TARGET) ../dataQsample.txt ../dataAsample.txt -rp
 
 test:$(TARGET)
-	for i in `seq 1 34`; do ./$(TARGET) `printf "../../ADC2017_Q_A/all/Q/Q%02d.txt" $$i` `printf "../../ADC2017_Q_A/all/A/A%02d.txt" $$i` -o `printf "RESOLV_A%02d.txt" $$i` -r; done
+	for i in `seq 1 34`; do ./$(TARGET) `printf "../../ADC2017_Q_A/all/Q/Q%02d.txt" $$i` `printf "../../ADC2017_Q_A/all/A/A%02d.txt" $$i` -r -o `printf "RESOLV_A%02d.txt" $$i`; done
 
 
 $(TARGET): $(OBJS)
-- 
2.22.0