minor cleanups, updated constructors, added checks for external minisat, removed unused file, dos2unix some old files , added optimization flag in makefile

marccane · marccane · commit 5ab41a80505e · 2020-09-06T20:55:09.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 CXX      := -c++
-CXXFLAGS := -std=c++17 -pedantic-errors -Wall -Wextra #-Werror
+CXXFLAGS := -O2 -std=c++17 -pedantic-errors -Wall -Wextra #-Werror
 LDFLAGS  := -L/usr/lib -lstdc++ -lm -lz
 BUILD    := ./build
 #do NOT blank this var
@@ -39,4 +39,4 @@ release: all
 
 clean:
 	-@rm -rv $(OBJ_DIR)/*
-	-@rm -v $(APP_DIR)/$(TARGET)
+	-@rm -v $(APP_DIR)/$(TARGET)
diff --git a/TileSAT.cbp b/TileSAT.cbp
@@ -60,13 +60,13 @@
 			<Add option="-fexceptions" />
 		</Compiler>
 		<Unit filename="include/clausules.h" />
-		<Unit filename="include/tile" />
 		<Unit filename="include/tile.h" />
 		<Unit filename="include/tileSAT.h" />
 		<Unit filename="include/utils.h" />
 		<Unit filename="src/clausules.cpp" />
 		<Unit filename="src/main.cpp" />
 		<Unit filename="src/tileSAT.cpp" />
+		<Unit filename="src/utils.cpp" />
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>
diff --git a/include/tile b/include/tile
diff --git a/include/tileSAT.h b/include/tileSAT.h
@@ -7,8 +7,9 @@
 class TileSAT
 {
     public:
-        TileSAT();
-        void doTiles(const string &inputTilesFile, bool printSolution, bool checkSolution, bool drawTiles, bool solve=true, int ampladaOverride=-1, int alcadaOverride=-1);
+        TileSAT(const string &);
+        TileSAT(const string &, int, int);
+        void doTiles(bool printSolution, bool drawTiles, bool solve=true);
 
     private:
         void generarTiles();
@@ -31,10 +32,11 @@ class TileSAT
             return i;
         }
 
+        const string &inputTilesFile;
         int nTiles, nColors, amplada, alcada; //parametres de la instancia
-        vector<Tile> inputTiles; //tiles d'entrada de la instancia
+        vector<Tile> inputTiles; //tiles d'entrada de la instancia. Rang 0..nTiles
         Clausules clausules; //clausules en CNF generades que representen les restriccions de la instancia
-        vector<vector<int>> tilesSolucio; //matriu solucio. Cada enter és un index d'una tile
+        vector<vector<int>> tilesSolucio; //matriu solucio. Cada enter és un index d'una tile. Rang dels index: 1..=nTiles
 
 };
 
diff --git a/input/aperiodic b/input/aperiodic
@@ -1,14 +1,14 @@
-13 5 105 105
-2 2 3 1
-2 3 2 1
-2 3 3 2
-1 1 2 2
-1 1 3 3
-1 2 2 3
-4 4 1 4
-3 4 2 4
-2 5 1 4
-2 5 4 4
-4 5 1 5
-3 5 2 5
-2 4 2 5
+13 5 40 40
+2 2 3 1
+2 3 2 1
+2 3 3 2
+1 1 2 2
+1 1 3 3
+1 2 2 3
+4 4 1 4
+3 4 2 4
+2 5 1 4
+2 5 4 4
+4 5 1 5
+3 5 2 5
+2 4 2 5
diff --git a/input/aperiodic11 b/input/aperiodic11
@@ -1,4 +1,4 @@
-11 4 20 20
+11 4 40 40
 1 1 1 2
 3 1 3 2
 1 2 2 2
diff --git a/input/aritmetica b/input/aritmetica
@@ -1,36 +1,36 @@
-34 9 7 14
-7 1 1 1
-7 7 7 7
-7 7 8 4
-7 8 7 8
-7 8 8 3
-3 3 7 8
-3 3 8 3
-7 2 1 2
-4 7 4 7
-4 7 3 4
-4 8 4 8
-4 8 3 3
-8 3 4 5
-8 3 3 6
-8 1 2 1
-8 4 7 7
-8 4 8 4
-4 5 7 8
-4 5 8 3
-8 6 7 5
-8 6 8 6
-3 2 2 2
-3 4 4 7
-3 4 3 4
-7 5 4 5
-7 5 3 6
-3 6 4 5
-3 6 3 6
-1 9 9 9
-2 9 9 9
-9 9 9 7
-9 9 9 2
-9 9 9 8
-9 9 9 1
-9 9 9 9
+34 9 7 14
+7 1 1 1
+7 7 7 7
+7 7 8 4
+7 8 7 8
+7 8 8 3
+3 3 7 8
+3 3 8 3
+7 2 1 2
+4 7 4 7
+4 7 3 4
+4 8 4 8
+4 8 3 3
+8 3 4 5
+8 3 3 6
+8 1 2 1
+8 4 7 7
+8 4 8 4
+4 5 7 8
+4 5 8 3
+8 6 7 5
+8 6 8 6
+3 2 2 2
+3 4 4 7
+3 4 3 4
+7 5 4 5
+7 5 3 6
+3 6 4 5
+3 6 3 6
+1 9 9 9
+2 9 9 9
+9 9 9 7
+9 9 9 2
+9 9 9 8
+9 9 9 1
+9 9 9 9
diff --git a/input/problem.py b/input/problem.py
@@ -1,34 +1,34 @@
-import sys
-from random import randint
-"""
-Genera tiles diferents de 4 colors, per intentar resoldre el problema de
-square tiling.
-"""
-
-def rand_tile(colors):
-    return [str(randint(1, colors)) for x in range(4)]
-
-def main():
-    if len(sys.argv) < 4:
-        print("Falten arguments")
-        return
-
-    num_tiles = int(sys.argv[1])
-    num_colors = int(sys.argv[2])
-    width = int(sys.argv[3])
-    height = int(sys.argv[4])
-    sys.stdout = open("input", "w")
-
-    print(num_tiles, num_colors, width, height)
-
-    tiles = []
-    while len(tiles) != num_tiles:
-        rtile = rand_tile(num_colors)
-        if not rtile in tiles:
-            tiles.append(rtile)
-
-    for tile in tiles:
-        print(' '.join(tile))
-
-if __name__ == "__main__":
-    main()
+import sys
+from random import randint
+"""
+Genera tiles diferents de 4 colors, per intentar resoldre el problema de
+square tiling.
+"""
+
+def rand_tile(colors):
+    return [str(randint(1, colors)) for x in range(4)]
+
+def main():
+    if len(sys.argv) < 4:
+        print("Falten arguments")
+        return
+
+    num_tiles = int(sys.argv[1])
+    num_colors = int(sys.argv[2])
+    width = int(sys.argv[3])
+    height = int(sys.argv[4])
+    sys.stdout = open("input", "w")
+
+    print(num_tiles, num_colors, width, height)
+
+    tiles = []
+    while len(tiles) != num_tiles:
+        rtile = rand_tile(num_colors)
+        if not rtile in tiles:
+            tiles.append(rtile)
+
+    for tile in tiles:
+        print(' '.join(tile))
+
+if __name__ == "__main__":
+    main()
diff --git a/src/main.cpp b/src/main.cpp
@@ -8,7 +8,6 @@ int main(int argc, char** argv)
 
     bool parametresOk = true;
     bool printSolution = false;
-    bool checkSolution = true;
     bool drawTiles = false;
     bool onlyTransform = false;
     bool solve = true;
@@ -17,8 +16,7 @@ int main(int argc, char** argv)
         cout<<"Usage: " << argv[0] << " [Options]...  <TilesProblemFile>" <<endl;
         cout<<"Options:"<<endl;
         cout<<"     -p      print solution in console"<<endl;
-        //cout<<"     -c      checkSolution (requires python and checkSolution.py)"<<endl;
-        cout<<"     -d      drawTiles (requires python3 in PATH, drawTiles.py and it's deps.)"<<endl;
+        cout<<"     -d      drawTiles (requires python3, drawTiles.py, tkinter and canvasvg)"<<endl;
         cout<<"     -g      don't solve, only generate cnf. Invalidates other options"<<endl;
         //cout<<"     -t      (special) transform minisat output to tiles solution. format: "<<argv[0]<<" -t <TilesProblemFile> <MiniSAT output>"<<endl;
         parametresOk = false;
@@ -30,8 +28,6 @@ int main(int argc, char** argv)
             string act = argv[i];
             if(act=="-d")
                 drawTiles = true;
-            else if(act=="-c")
-                checkSolution = true;
             else if(act=="-p")
                 printSolution = true;
             else if(act=="-g")
@@ -49,8 +45,8 @@ int main(int argc, char** argv)
             i++;
         }
     }
-
-    /*if(onlyTransform){ //todo: fix this
+    /*
+    if(onlyTransform){ //todo: fix this
         inputTilesFile = argv[2];
         string minisatFilename = argv[3];
 
@@ -65,9 +61,9 @@ int main(int argc, char** argv)
 
     if(parametresOk)
         try{
-            TileSAT tileSAT;
-            tileSAT.doTiles(inputTilesFile, printSolution, checkSolution, drawTiles, solve);
-        }catch(const char* c){
+            TileSAT tileSAT(inputTilesFile);
+            tileSAT.doTiles(printSolution, drawTiles, solve);
+        } catch(const char* c){
             cerr << c << endl;
             return 0x10;
         } catch(string s){
diff --git a/src/tileSAT.cpp b/src/tileSAT.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-11 4 20 20`
	`1`	`+11 4 40 40`
`2`	`2`	`1 1 1 2`
`3`	`3`	`3 1 3 2`
`4`	`4`	`1 2 2 2`