solve func + changes in check legal value

nofarmo · nofarmo · commit 1206463bbe31 · 2020-02-24T23:32:23.000+02:00
diff --git a/files_utils.c b/files_utils.c
@@ -44,7 +44,6 @@ int read_file_to_board (Board* board, char* path){
     
     fptr = fopen(path,'r'); 
     if(fptr ==NULL){
-        printf("Error: invalid file\n");
         fclose(fptr);
         return 0;
     }
@@ -62,7 +61,6 @@ int read_file_to_board (Board* board, char* path){
         }
     }
     if(count<2){
-        printf("Error: invalid file\n");
         fclose(fptr);
         return 0;
     }
@@ -82,28 +80,36 @@ int read_file_to_board (Board* board, char* path){
         }
         if(count_scan != 0){
             if(value > size || value < 1){
-                printf("Error: invalid file\n");
                 fclose(fptr);
                 return 0;
             }
             if(count_dot == 1){
-                board->fixed_board[i][j]=value;
-            }
-            else{
                 if(value == 0){
-                        board->cur_board[i][j]=BOARD_NULL_VALUE;
-                    }
+                    board->fixed_board[i][j]=BOARD_NULL_VALUE;
+                }
                 else{
-                    board->cur_board[i][j]=value;
+                    if(is_legal(i,j,value,board,1)){
+                        board->fixed_board[i][j]=value;
+                    }
+                    else{
+                        fclose(fptr);
+                        return 0;
+                    }
                 }
             }
+            if(value == 0){
+                    board->cur_board[i][j]=BOARD_NULL_VALUE;
+            }
+            else{
+                    board->cur_board[i][j]=value;
+                    if(count_dot == 0){board->count_filled++;}; /*not fixed*/
+            }
             if(j!=size-1){j++;}
             else{i++;j=0;}
         }
     }
     if(i!=size){
-        printf("Error: invalid file\n");
-         fclose(fptr);
+        fclose(fptr);
         return 0;
     }
     fclose(fptr);
diff --git a/sudoku_board.c b/sudoku_board.c
@@ -3,50 +3,54 @@
 #include <math.h>
 
 /* all functions in this file get 0<=x,y<=row*col-1 */
+/* if is_fix == 1 value from fixed_board else from cur*/
 
-int get_value(int x, int y, Board* board){
-    return (board->cur_board)[x][y];
+int get_value(int x, int y, Board* board, int is_fix){
+    if(is_fix==0){
+        return (board->cur_board)[x][y];
+    }
+    return (board->fixed_board)[x][y];
 }
 
 /* return 1 if value was found in row*/
-int value_in_row(int row, int value, Board* board){
+int value_in_row(int row, int value, Board* board, int is_fix){
     int i;
     int size = (board->num_of_rows)*(board->num_of_columns);
     for (i=0; i<size; i++){
-         if(get_value(row,i,board) == value)
+         if(get_value(row,i,board,is_fix) == value)
             return 1;
     }
     return 0;
 }
 
 /* return 1 if value was found in col*/
-int value_in_col(int col, int value, Board* board){
+int value_in_col(int col, int value, Board* board,int is_fix){
     int i;
     int size = (board->num_of_rows)*(board->num_of_columns);
     for (i=0; i<size; i++){
-         if(get_value(i,col,board) == value)
+         if(get_value(i,col,board,is_fix) == value)
             return 1;
     }
     return 0;
 }
 
 /* return 1 if value was found in square*/
-int value_in_square(int row, int col, int value, Board* board){
+int value_in_square(int row, int col, int value, Board* board,int is_fix){
     int i,j;
     int top_left_corner_row = floor(row/board->num_of_rows)*board->num_of_rows; 
     int top_left_corner_col = floor(col/board->num_of_columns)*board->num_of_columns; 
     for(i= top_left_corner_row; i<top_left_corner_row+board->num_of_rows; i++){
         for(j= top_left_corner_col; j<top_left_corner_col+board->num_of_columns; j++){
-            if(get_value(i,j,board) == value)
+            if(get_value(i,j,board,is_fix) == value)
                 return 1;
         }
     }
     return 0;
 }
 
-int set_value(int x, int y, int value, Board* board){
-    if((value_in_row(x,value,board) || value_in_col(y,value,board) || value_in_square(x,y,value,board) ))
-        return 0;     
+int set_value(int x, int y, int value, Board* board,int is_fix){
+    if(is_legal(x,y,value,board,is_fix)==0){
+        return 0;}     
     board->cur_board[x][y] = value;
     board->count_filled++;
     return 1;
@@ -73,3 +77,9 @@ int create_empty_board(Board* board, int rows, int columns) {
 
     return 1;
 }
+
+int is_legal(int x, int y, int value, Board* board, int is_fix){
+    if((value_in_row(x,value,board,is_fix) || value_in_col(y,value,board,is_fix) || value_in_square(x,y,value,board,is_fix) ))
+        return 0;
+    return 1;
+}
diff --git a/sudoku_board.h b/sudoku_board.h
@@ -21,8 +21,9 @@ typedef struct _Board {
 } Board;
 
 int set_value(int x, int y, int value, Board* board);
-int get_value(int x, int y, Board* board);
+int get_value(int x, int y, Board* board, int fixed_board);
 int erase_value(int x, int y, Board* board);
 int create_empty_board(Board* board, int rows, int columns);
+int is_legal(int x, int y, int value, Board* board, int is_fix);
 
 #endif 
diff --git a/sudoku_board_actions.c b/sudoku_board_actions.c
@@ -3,6 +3,7 @@
 #include "backtracking_core_logic.h"
 #include "puzzle_generator.h"
 #include "2d_array_utils.h"
+#include "files_utils.h"
 
 void print_board(Board* board){
     int a, b, c, d;
@@ -22,7 +23,7 @@ void print_board(Board* board){
             for(c = 0; c < board->num_of_rows; c++){
                 for(d = 0; d < board->num_of_columns; d++){
                     col = d + c*board->num_of_columns;
-                    value = get_value(row,col,board);
+                    value = get_value(row,col,board,0);
                     if(board->fixed_board[row][col] != BOARD_NULL_VALUE){
                         printf(" %2d.",value);
                     }
@@ -69,7 +70,7 @@ int set_value_user(int x, int y, int value, Board* board){
         print_board(board);
         return 0;
     }
-    if(set_value(x-1,y-1,value,board) == 0 && board->cur_board[x-1][y-1]!=value){
+    if(set_value(x-1,y-1,value,board,0) == 0 && board->cur_board[x-1][y-1]!=value){
             printf("Error: value is invalid\n");
             return 0;
     }
@@ -157,3 +158,18 @@ void seed(int seed) {
     srand(seed);
 }
 
+void solve(Board* board, char* path){
+    int succeeded;
+    succeeded = read_file_to_board(board,path);
+    if(succeeded == 0){
+        printf("Error: invalid file\n");
+        board->mode = INIT;
+        /*dont have to clean board still in INIT mode*/
+    }
+    else{
+        board->mode=SOLVE;
+    }
+} 
+
+void edit(Board* board, char* path); //read
+void save(Board* board, char* path); //write
diff --git a/sudoku_board_actions.h b/sudoku_board_actions.h
@@ -15,8 +15,8 @@ void exit_game(Board* board);
 void seed(int seed);
 int is_filled(Board* board);
 
-void solve(Board* board, char* path); //read
-void edit(Board* board, char* path); //read
-void save(Board* board, char* path); //write
+void solve(Board* board, char* path);
+void edit(Board* board, char* path);
+void save(Board* board, char* path);
 
 #endif
diff --git a/tasks.txt b/tasks.txt
@@ -12,3 +12,4 @@ nofar
 
 both
 1. כל הפקודות החדשות - בהתאם לחלוקת המשימות
+2. סידור main ומהלך ריצה תקין

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ int read_file_to_board (Board* board, char* path){`
`44`	`44`
`45`	`45`	`fptr = fopen(path,'r');`
`46`	`46`	`if(fptr ==NULL){`
`47`		`- printf("Error: invalid file\n");`
`48`	`47`	`fclose(fptr);`
`49`	`48`	`return 0;`
`50`	`49`	`}`
`@@ -62,7 +61,6 @@ int read_file_to_board (Board* board, char* path){`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`	`if(count<2){`
`65`		`- printf("Error: invalid file\n");`
`66`	`64`	`fclose(fptr);`
`67`	`65`	`return 0;`
`68`	`66`	`}`
`@@ -82,28 +80,36 @@ int read_file_to_board (Board* board, char* path){`
`82`	`80`	`}`
`83`	`81`	`if(count_scan != 0){`
`84`	`82`	`if(value > size \|\| value < 1){`
`85`		`- printf("Error: invalid file\n");`
`86`	`83`	`fclose(fptr);`
`87`	`84`	`return 0;`
`88`	`85`	`}`
`89`	`86`	`if(count_dot == 1){`
`90`		`- board->fixed_board[i][j]=value;`
`91`		`- }`
`92`		`- else{`
`93`	`87`	`if(value == 0){`
`94`		`- board->cur_board[i][j]=BOARD_NULL_VALUE;`
`95`		`- }`
	`88`	`+ board->fixed_board[i][j]=BOARD_NULL_VALUE;`
	`89`	`+ }`
`96`	`90`	`else{`
`97`		`- board->cur_board[i][j]=value;`
	`91`	`+ if(is_legal(i,j,value,board,1)){`
	`92`	`+ board->fixed_board[i][j]=value;`
	`93`	`+ }`
	`94`	`+ else{`
	`95`	`+ fclose(fptr);`
	`96`	`+ return 0;`
	`97`	`+ }`
`98`	`98`	`}`
`99`	`99`	`}`
	`100`	`+ if(value == 0){`
	`101`	`+ board->cur_board[i][j]=BOARD_NULL_VALUE;`
	`102`	`+ }`
	`103`	`+ else{`
	`104`	`+ board->cur_board[i][j]=value;`
	`105`	`+ if(count_dot == 0){board->count_filled++;}; /not fixed/`
	`106`	`+ }`
`100`	`107`	`if(j!=size-1){j++;}`
`101`	`108`	`else{i++;j=0;}`
`102`	`109`	`}`
`103`	`110`	`}`
`104`	`111`	`if(i!=size){`
`105`		`- printf("Error: invalid file\n");`
`106`		`- fclose(fptr);`
	`112`	`+ fclose(fptr);`
`107`	`113`	`return 0;`
`108`	`114`	`}`
`109`	`115`	`fclose(fptr);`
Original file line number	Diff line number	Diff line change
`@@ -12,3 +12,4 @@ nofar`
`12`	`12`
`13`	`13`	`both`
`14`	`14`	`1. כל הפקודות החדשות - בהתאם לחלוקת המשימות`
	`15`	`+2. סידור main ומהלך ריצה תקין`