aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSebastiano Tronto <sebastiano.tronto@gmail.com>2020-07-11 19:51:04 +0200
committerSebastiano Tronto <sebastiano.tronto@gmail.com>2020-07-11 19:51:04 +0200
commit0fe7c8b43c50ae5701463acbb186a6fe0f53a773 (patch)
tree72ec22e4bf41fb222d6f3bfcb390fb8381b09fea /src/main.c
parent73eae801076b4c17d6b3d2d23db9e39938b01586 (diff)
downloadnissy-0fe7c8b43c50ae5701463acbb186a6fe0f53a773.tar.gz
nissy-0fe7c8b43c50ae5701463acbb186a6fe0f53a773.zip
Bug fix
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main.c b/src/main.c
index 30fe517..0a29d0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -68,7 +68,7 @@ int read_moves_from_argument(int n, char tok[][100], int *dst) {
68 return (r != -1) ? r : read_moves_from_tok(n, tok, dst); 68 return (r != -1) ? r : read_moves_from_tok(n, tok, dst);
69} 69}
70 70
71void print_results(int n, int res[][21]) { 71void print_results(int n, int res[][30]) {
72 if (n == -1) 72 if (n == -1)
73 printf("Pre-conditions not satisfied (or other error).\n"); 73 printf("Pre-conditions not satisfied (or other error).\n");
74 74
@@ -314,7 +314,7 @@ void pic_cmd(int n, char cmdtok[][100]) {
314} 314}
315 315
316void solve_cmd(int n, char cmdtok[][100]) { 316void solve_cmd(int n, char cmdtok[][100]) {
317 int m = 1, b = 20, optimal = 0; 317 int m = 1, b = 25, optimal = 0;
318 int scram[255] = {[0] = 0}; 318 int scram[255] = {[0] = 0};
319 int scram_unnissed[255]; 319 int scram_unnissed[255];
320 320
@@ -349,7 +349,7 @@ void solve_cmd(int n, char cmdtok[][100]) {
349 349
350 /* Call solver and print results */ 350 /* Call solver and print results */
351 unniss(scram, scram_unnissed); 351 unniss(scram, scram_unnissed);
352 int sol[m+2][21]; 352 int sol[m+2][30];
353 int s = solve_scram(scram_unnissed, sol, m, b, optimal); 353 int s = solve_scram(scram_unnissed, sol, m, b, optimal);
354 print_results(s, sol); 354 print_results(s, sol);
355} 355}
@@ -382,7 +382,7 @@ void replace_cmd(int n, char cmdtok[][100]) {
382 382
383 unniss(scram, scram_unnissed); 383 unniss(scram, scram_unnissed);
384 int l = len(scram_unnissed); 384 int l = len(scram_unnissed);
385 int aux1[255], aux2[15][21], aux3[21]; 385 int aux1[255], aux2[15][30], aux3[30];
386 for (int i = 0; i < l; i++) { 386 for (int i = 0; i < l; i++) {
387 for (int j = 2; j <= m && i + j <= l; j++) { 387 for (int j = 2; j <= m && i + j <= l; j++) {
388 copy_moves(scram_unnissed+i, aux1); 388 copy_moves(scram_unnissed+i, aux1);
@@ -459,7 +459,7 @@ void eo_cmd(int n, char cmdtok[][100]) {
459 unniss(scram, scram_unnissed); 459 unniss(scram, scram_unnissed);
460 460
461 /* Call solver and print results */ 461 /* Call solver and print results */
462 int eo_list[m+5][21]; 462 int eo_list[m+5][30];
463 int neo = eo_scram_spam(scram_unnissed, eo_list, fb, rl, ud, m, b, niss, 463 int neo = eo_scram_spam(scram_unnissed, eo_list, fb, rl, ud, m, b, niss,
464 hide); 464 hide);
465 print_results(neo, eo_list); 465 print_results(neo, eo_list);
@@ -531,7 +531,7 @@ void dr_cmd(int n, char cmdtok[][100]) {
531 unniss(scram, scram_unnissed); 531 unniss(scram, scram_unnissed);
532 532
533 /* Call solver */ 533 /* Call solver */
534 int dr_list[m+5][21], ndr; 534 int dr_list[m+5][30], ndr;
535 if (from) { 535 if (from) {
536 ndr = drfrom_scram_spam(scram_unnissed, dr_list, from, fb, rl, ud, 536 ndr = drfrom_scram_spam(scram_unnissed, dr_list, from, fb, rl, ud,
537 m, b, niss, hide); 537 m, b, niss, hide);
@@ -600,7 +600,7 @@ void htr_cmd(int n, char cmdtok[][100]) {
600 unniss(scram, scram_unnissed); 600 unniss(scram, scram_unnissed);
601 601
602 /* Call solver */ 602 /* Call solver */
603 int htr_list[m+5][21], nhtr; 603 int htr_list[m+5][30], nhtr;
604 nhtr = htr_scram_spam(scram_unnissed, htr_list, from, m, b, niss, hide); 604 nhtr = htr_scram_spam(scram_unnissed, htr_list, from, m, b, niss, hide);
605 print_results(nhtr, htr_list); 605 print_results(nhtr, htr_list);
606} 606}
@@ -652,7 +652,7 @@ void drfinish_cmd(int n, char cmdtok[][100]) {
652 unniss(scram, scram_unnissed); 652 unniss(scram, scram_unnissed);
653 653
654 /* Call solver */ 654 /* Call solver */
655 int c_list[m+5][21], nc; 655 int c_list[m+5][30], nc;
656 nc = dr_finish_scram_spam(scram_unnissed, c_list, from, m, b); 656 nc = dr_finish_scram_spam(scram_unnissed, c_list, from, m, b);
657 print_results(nc, c_list); 657 print_results(nc, c_list);
658} 658}
@@ -693,7 +693,7 @@ void htrfinish_cmd(int n, char cmdtok[][100]) {
693 unniss(scram, scram_unnissed); 693 unniss(scram, scram_unnissed);
694 694
695 /* Call solver */ 695 /* Call solver */
696 int c_list[m+5][21], nc; 696 int c_list[m+5][30], nc;
697 nc = htr_finish_scram_spam(scram_unnissed, c_list, m, b); 697 nc = htr_finish_scram_spam(scram_unnissed, c_list, m, b);
698 print_results(nc, c_list); 698 print_results(nc, c_list);
699} 699}
@@ -747,7 +747,7 @@ void drcorners_cmd(int n, char cmdtok[][100]) {
747 unniss(scram, scram_unnissed); 747 unniss(scram, scram_unnissed);
748 748
749 /* Call solver */ 749 /* Call solver */
750 int c_list[m+5][21], nc; 750 int c_list[m+5][30], nc;
751 nc = dr_corners_scram_spam(scram_unnissed, c_list, from, m, b, ignore); 751 nc = dr_corners_scram_spam(scram_unnissed, c_list, from, m, b, ignore);
752 print_results(nc, c_list); 752 print_results(nc, c_list);
753} 753}

Generated with cgit - Back to sebastiano.tronto.net