25/10/2017:

1. Coding is Done.
2. The BUG!!!

Sparsa Roychowdhury

input1/example

@@ -9,11 +9,11 @@
 0
 
 2 3 0 1 1
-1 0 0 1 1
+1 0 0 1 0
 2
 0
 
 3 4 0 2 0
 1 0 0 1 0 
-2 1 1 2 0
+2 1 0 2 0
 0

input1/example.out

@@ -5,6 +5,6 @@ digraph finite_state_machine {
 	qi0 -> 0;
 	0 -> 1 [ label = "{tn:0,x1:=0,x2:=0}" ];
 	1 -> 2 [ label = "{tn:1,x1:=0}" ];
-	2 -> 3 [ label = "{tn:2,0<=x1<1,x2:=0}" ];
-	3 -> 4 [ label = "{tn:3,0<=x1<1,1<x2<=2}" ];
+	2 -> 3 [ label = "{tn:2,0<=x1<=1,x2:=0}" ];
+	3 -> 4 [ label = "{tn:3,0<=x1<=1,1<=x2<=2}" ];
 }
\ No newline at end of file

input1/example_problem

+4 3 2 0 0
+
+1
+
+4
+
+1 2 0 0 1
+1
+0
+
+2 3 0 1 1
+1 0 0 1 1
+2
+0
+
+3 4 0 2 0
+1 0 0 1 1 
+2 1 1 2 0
+0

input1/example_problem.out

+digraph finite_state_machine {
+	node [shape = point ]; qi0;
+	node [shape = doublecircle];4;
+	node [shape=circle];
+	qi0 -> 0;
+	0 -> 1 [ label = "{tn:0,x1:=0,x2:=0}" ];
+	1 -> 2 [ label = "{tn:1,x1:=0}" ];
+	2 -> 3 [ label = "{tn:2,0<=x1<1,x2:=0}" ];
+	3 -> 4 [ label = "{tn:3,0<=x1<1,1<x2<=2}" ];
+}
\ No newline at end of file

makefile

 CC  :=  g++
-CFLAG := -lm -fopenmp -std=c++14
+CFLAG := -lm -fopenmp -Wall -std=c++14
 SRC := ./src
 OBJ := ./obj
 INC := ./include
@@ -8,38 +8,38 @@ GDB := -g
 
 
 tree : main.o $(OBJ)/treeBitOperations.o $(OBJ)/timePushDown.o $(OBJ)/continuoustpda.o $(OBJ)/pds.o $(OBJ)/tpdaCGPP.o $(OBJ)/tpdaZone.o $(OBJ)/tpda2.o $(OBJ)/circuitfinder.o drawsystem
-	g++ $(GDB) main.o $(OBJ)/treeBitOperations.o $(OBJ)/timePushDown.o $(OBJ)/continuoustpda.o $(OBJ)/pds.o $(OBJ)/tpdaCGPP.o $(OBJ)/tpdaZone.o $(OBJ)/tpda2.o $(OBJ)/circuitfinder.o -o $(EXE) $(CFLAG)
+	$(CC) $(GDB) main.o $(OBJ)/treeBitOperations.o $(OBJ)/timePushDown.o $(OBJ)/continuoustpda.o $(OBJ)/pds.o $(OBJ)/tpdaCGPP.o $(OBJ)/tpdaZone.o $(OBJ)/tpda2.o $(OBJ)/circuitfinder.o -o $(EXE) $(CFLAG)
 
 main.o : main.cpp
-	g++ $(GDB) -I $(INC) -c main.cpp -o main.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c main.cpp -o main.o $(CFLAG)
 $(OBJ)/circuitfinder.o : $(SRC)/circuitfinder.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/circuitfinder.cpp -o $(OBJ)/circuitfinder.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/circuitfinder.cpp -o $(OBJ)/circuitfinder.o $(CFLAG)
 $(OBJ)/tpdaZone.o : $(SRC)/tpdaZone.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/tpdaZone.cpp -o $(OBJ)/tpdaZone.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/tpdaZone.cpp -o $(OBJ)/tpdaZone.o $(CFLAG)
 	
 $(OBJ)/tpdaCGPP.o : $(SRC)/tpdaCGPP.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/tpdaCGPP.cpp -o $(OBJ)/tpdaCGPP.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/tpdaCGPP.cpp -o $(OBJ)/tpdaCGPP.o $(CFLAG)
 	
 $(OBJ)/continuoustpda.o : $(SRC)/continuoustpda.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/continuoustpda.cpp -o $(OBJ)/continuoustpda.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/continuoustpda.cpp -o $(OBJ)/continuoustpda.o $(CFLAG)
 	
 $(OBJ)/tpda2.o : $(SRC)/tpda2.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/tpda2.cpp -o $(OBJ)/tpda2.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/tpda2.cpp -o $(OBJ)/tpda2.o $(CFLAG)
 	
 $(OBJ)/pds.o : $(SRC)/pds.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/pds.cpp -o $(OBJ)/pds.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/pds.cpp -o $(OBJ)/pds.o $(CFLAG)
 
 drawsystem : $(OBJ)/drawsystem.o $(OBJ)/treeBitOperations.o
-	g++ $(GDB) $(OBJ)/drawsystem.o $(OBJ)/treeBitOperations.o -o drawsystem $(CFLAG)
+	$(CC $(GDB) $(OBJ)/drawsystem.o $(OBJ)/treeBitOperations.o -o drawsystem $(CFLAG)
 	
 $(OBJ)/drawsystem.o : $(SRC)/drawsystem.cpp 
-	g++ $(GDB) -I $(INC) -c $(SRC)/drawsystem.cpp -o $(OBJ)/drawsystem.o $(CFLAG)	
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/drawsystem.cpp -o $(OBJ)/drawsystem.o $(CFLAG)	
 	
 $(OBJ)/timePushDown.o : $(SRC)/timePushDown.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/timePushDown.cpp -o $(OBJ)/timePushDown.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/timePushDown.cpp -o $(OBJ)/timePushDown.o $(CFLAG)
 	
 $(OBJ)/treeBitOperations.o : $(SRC)/treeBitOperations.cpp
-	g++ $(GDB) -I $(INC) -c $(SRC)/treeBitOperations.cpp -o $(OBJ)/treeBitOperations.o $(CFLAG)
+	$(CC) $(GDB) -I $(INC) -c $(SRC)/treeBitOperations.cpp -o $(OBJ)/treeBitOperations.o $(CFLAG)
 
 
 

src/tpdaCGPP.cpp

@@ -1767,6 +1767,7 @@ stateGCPP* stateGCPP::reduce2(char dn,char wn,short* clockDis,bool* clockAcc,sho
                 }
                 if(dis_l == 0)
                 {
+                    if(store_matrix[P-1][P] > leq)
                     store_matrix[P-1][P] = leq;
                 }
             }