Merge master

README.md

+# 2019/08/26 追記
+配線失敗時にボードを出力しないように変更しました
+
 # 実行方法
 ```
 cd nszw-solver

main.cpp

@@ -6,8 +6,12 @@
 
 int main(void){
 	read_problem();
-	solver();
-	print_answer();
+	if(solver()){
+		printf("success!");
+		print_answer();
+	}else{
+		printf("failed...");
+	}
 
 	return 0;
 }

solver.cpp

@@ -26,6 +26,8 @@ short int board_str[900];
 short int line_board[72][72];
 short int mino_board[72][72];
 short int put_data[72][72];
+short int success=0;
+short int answerw=0,answerh=0;
 vector <int> mino_order;
 
 void reset_board(void){
@@ -49,6 +51,8 @@ void show_blocks(){
 }
 
 void read_data(void){
+	answerw=W;
+	answerh=H;
 	//show_blocks();
 	return;
 }
@@ -552,6 +556,7 @@ int line(){
 		if(status){
 		//std::cout << "success to line" << std::endl;
 		make_answer();
+		success=1;
 	}else{
 		//std::cout << "failed to line" << std::endl;
 	}
@@ -1010,11 +1015,12 @@ void solve(void){
 	return;
 }
 
-void solver(void){
+int solver(void){
 	read_data();
 	solve();
 	/* shape(); */
 	//translate();
-	return;
+	if(w>answerw || h>answerh) success=0;
+	return success;
 }
 

solver.h

@@ -5,6 +5,6 @@
 
 #define MAXSIZE 128
 
-void solver(void);
+int solver(void);
 
 #endif // _SOLVER_H_