Ticket #183: draqo-dfa.diff

doc/patterns.texi

@@ -1397 +1397 @@
 @file{patterns.h}) by a standalone program @file{mkpat.c}, and the resulting 
 @file{.c} files are compiled and linked into the main GNU Go executable.
 
+IMPORTANT: After any change in patterns, which uses DFA pattern matching, one
+should optimize pattern databases, in which the changes was made. This is done
+by running a part of @file{optimize} script in @file{patterns} directory. Run
+only parts of this script, which refers to desired databases, because it takes
+a very long time to execute.
+
 Each pattern is compiled to a header, and a sequence of elements,
 which are (notionally) checked sequentially at every position and
 orientation of the board. These elements are relative to the pattern

engine/matchpat.c

@@ -642 +642 @@
 static int
 scan_for_patterns(dfa_rt_t *pdfa, int l, int *dfa_pos, int *pat_list)
 {
-  int delta;
   int state = 1; /* initial state */
   int row = 0; /* initial row */
   int id = 0; /* position in id_list */
@@ -657 +656 @@
     }
 
     /* go to next state */
-    delta = pdfa->states[state].next[dfa_pos[spiral[row][l]]];
-    state += delta;
+    state = pdfa->states[state].next[dfa_pos[spiral[row][l]]];
     row++;
-  } while (delta != 0); /* while not on error state */
+  } while (state != 0); /* while not on error state */
 
   return id;
 }

patterns/Makefile.am

@@ -3 +3 @@
 
 DSP = dfa.dsp patterns.dsp joseki.dsp mkeyes.dsp mkpat.dsp fuseki.dsp
 DTR = aa_attackpats.dtr owl_attackpats.dtr owl_defendpats.dtr \
-       owl_vital_apats.dtr
+       owl_vital_apats.dtr attack.dtr defense.dtr conn.dtr \
+       barriers.dtr endgame.dtr handicap.dtr influence.dtr \
+       patterns.dtr
 
 EXTRA_DIST = $(DSP)\
         $(DTR)\
@@ -121 +123 @@
 takamoku.db : $(srcdir)/takamoku.sgf joseki$(EXEEXT)
         ./joseki JT $(srcdir)/takamoku.sgf >takamoku.db
 
-patterns.c : $(srcdir)/patterns.db $(srcdir)/patterns2.db mkpat$(EXEEXT)
-        ./mkpat -b pat -i $(srcdir)/patterns.db -i$(srcdir)/patterns2.db \
-               -o patterns.c
+patterns.c : $(srcdir)/patterns.db $(srcdir)/patterns2.db $(srcdir)/patterns.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/patterns.dtr pat \
+               -i $(srcdir)/patterns.db -i$(srcdir)/patterns2.db -o patterns.c
 
 josekidb.c : $(DBBUILT) mkpat$(EXEEXT)
         ./mkpat -C joseki $(DBBUILT_INPUT) -o josekidb.c
 
-apatterns.c : $(srcdir)/attack.db mkpat$(EXEEXT)
-        ./mkpat -X attpat -i $(srcdir)/attack.db -o apatterns.c
-
-dpatterns.c : $(srcdir)/defense.db mkpat$(EXEEXT)
-        ./mkpat defpat -i $(srcdir)/defense.db -o dpatterns.c
-
-conn.c : $(srcdir)/conn.db mkpat$(EXEEXT)
-        ./mkpat -c conn -i $(srcdir)/conn.db -o conn.c
-
-endgame.c : $(srcdir)/endgame.db mkpat$(EXEEXT)
-        ./mkpat -b endpat -i $(srcdir)/endgame.db -o endgame.c
+apatterns.c : $(srcdir)/attack.db $(srcdir)/attack.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -X -t $(srcdir)/attack.dtr attpat \
+               -i $(srcdir)/attack.db -o apatterns.c
+
+dpatterns.c : $(srcdir)/defense.db $(srcdir)/defense.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -t $(srcdir)/defense.dtr defpat \
+               -i $(srcdir)/defense.db -o dpatterns.c
+
+conn.c : $(srcdir)/conn.db $(srcdir)/conn.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -t $(srcdir)/conn.dtr conn \
+               -i $(srcdir)/conn.db -o conn.c
+
+endgame.c : $(srcdir)/endgame.db $(srcdir)/endgame.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/endgame.dtr endpat \
+               -i $(srcdir)/endgame.db -o endgame.c
 
 eyes.c: $(srcdir)/eyes.db mkeyes$(EXEEXT)
         ./mkeyes < $(srcdir)/eyes.db >eyes.c
 
-influence.c : $(srcdir)/influence.db mkpat$(EXEEXT)
-        ./mkpat -c influencepat -i $(srcdir)/influence.db -o influence.c
-
-barriers.c : $(srcdir)/barriers.db mkpat$(EXEEXT)
-        ./mkpat -c -b barrierspat -i $(srcdir)/barriers.db -o barriers.c
+influence.c : $(srcdir)/influence.db $(srcdir)/influence.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -t $(srcdir)/influence.dtr influencepat \
+               -i $(srcdir)/influence.db -o influence.c
+
+barriers.c : $(srcdir)/barriers.db $(srcdir)/barriers.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -b -t $(srcdir)/barriers.dtr barrierspat \
+               -i $(srcdir)/barriers.db -o barriers.c
 
 aa_attackpat.c : $(srcdir)/aa_attackpats.db $(srcdir)/aa_attackpats.dtr mkpat$(EXEEXT)
         ./mkpat $(DFAFLAGS) -b -t $(srcdir)/aa_attackpats.dtr aa_attackpat \
@@ -169 +177 @@
                -i $(srcdir)/owl_defendpats.db -o owl_defendpat.c
 
 fusekipat.c : $(srcdir)/fuseki.db mkpat$(EXEEXT)
-        ./mkpat -b fusekipat -i $(srcdir)/fuseki.db -o fusekipat.c
+        ./mkpat -b -m fusekipat -i $(srcdir)/fuseki.db -o fusekipat.c
 
 fuseki9.c : $(srcdir)/fuseki9.dbz uncompress_fuseki$(EXEEXT)
         ./uncompress_fuseki 9 $(srcdir)/fuseki9.dbz c >fuseki9.c
@@ -180 +188 @@
 fuseki19.c : $(srcdir)/fuseki19.dbz uncompress_fuseki$(EXEEXT)
         ./uncompress_fuseki 19 $(srcdir)/fuseki19.dbz c >fuseki19.c
 
-handipat.c : $(srcdir)/handicap.db mkpat$(EXEEXT)
-        ./mkpat -b handipat -i $(srcdir)/handicap.db -o handipat.c
+handipat.c : $(srcdir)/handicap.db $(srcdir)/handicap.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/handicap.dtr handipat \
+               -i $(srcdir)/handicap.db -o handipat.c
 
 
 ETAGS_ARGS = --language none --regex '/^Pattern[ \t]+[a-zA-Z0-9]+/' $(DB_TO_TAG)\

patterns/Makefile.in

@@ -80 +80 @@
 
 DSP = dfa.dsp patterns.dsp joseki.dsp mkeyes.dsp mkpat.dsp fuseki.dsp
 DTR = aa_attackpats.dtr owl_attackpats.dtr owl_defendpats.dtr \
-       owl_vital_apats.dtr
+       owl_vital_apats.dtr attack.dtr defense.dtr conn.dtr \
+       barriers.dtr endgame.dtr handicap.dtr influence.dtr \
+       patterns.dtr
 
 
 EXTRA_DIST = $(DSP)\
@@ -526 +528 @@
 takamoku.db : $(srcdir)/takamoku.sgf joseki$(EXEEXT)
         ./joseki JT $(srcdir)/takamoku.sgf >takamoku.db
 
-patterns.c : $(srcdir)/patterns.db $(srcdir)/patterns2.db mkpat$(EXEEXT)
-        ./mkpat -b pat -i $(srcdir)/patterns.db -i$(srcdir)/patterns2.db \
-               -o patterns.c
+patterns.c : $(srcdir)/patterns.db $(srcdir)/patterns2.db $(srcdir)/patterns.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/patterns.dtr pat \
+               -i $(srcdir)/patterns.db -i$(srcdir)/patterns2.db -o patterns.c
 
 josekidb.c : $(DBBUILT) mkpat$(EXEEXT)
         ./mkpat -C joseki $(DBBUILT_INPUT) -o josekidb.c
 
-apatterns.c : $(srcdir)/attack.db mkpat$(EXEEXT)
-        ./mkpat -X attpat -i $(srcdir)/attack.db -o apatterns.c
-
-dpatterns.c : $(srcdir)/defense.db mkpat$(EXEEXT)
-        ./mkpat defpat -i $(srcdir)/defense.db -o dpatterns.c
-
-conn.c : $(srcdir)/conn.db mkpat$(EXEEXT)
-        ./mkpat -c conn -i $(srcdir)/conn.db -o conn.c
-
-endgame.c : $(srcdir)/endgame.db mkpat$(EXEEXT)
-        ./mkpat -b endpat -i $(srcdir)/endgame.db -o endgame.c
+apatterns.c : $(srcdir)/attack.db $(srcdir)/attack.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -X -t $(srcdir)/attack.dtr attpat \
+               -i $(srcdir)/attack.db -o apatterns.c
+
+dpatterns.c : $(srcdir)/defense.db $(srcdir)/defense.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -t $(srcdir)/defense.dtr defpat \
+               -i $(srcdir)/defense.db -o dpatterns.c
+
+conn.c : $(srcdir)/conn.db $(srcdir)/conn.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -t $(srcdir)/conn.dtr conn \
+               -i $(srcdir)/conn.db -o conn.c
+
+endgame.c : $(srcdir)/endgame.db $(srcdir)/endgame.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/endgame.dtr endpat \
+               -i $(srcdir)/endgame.db -o endgame.c
 
 eyes.c: $(srcdir)/eyes.db mkeyes$(EXEEXT)
         ./mkeyes < $(srcdir)/eyes.db >eyes.c
 
-influence.c : $(srcdir)/influence.db mkpat$(EXEEXT)
-        ./mkpat -c influencepat -i $(srcdir)/influence.db -o influence.c
-
-barriers.c : $(srcdir)/barriers.db mkpat$(EXEEXT)
-        ./mkpat -c -b barrierspat -i $(srcdir)/barriers.db -o barriers.c
+influence.c : $(srcdir)/influence.db $(srcdir)/influence.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -t $(srcdir)/influence.dtr influencepat \
+               -i $(srcdir)/influence.db -o influence.c
+
+barriers.c : $(srcdir)/barriers.db $(srcdir)/barriers.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -c -b -t $(srcdir)/barriers.dtr barrierspat \
+               -i $(srcdir)/barriers.db -o barriers.c
 
 aa_attackpat.c : $(srcdir)/aa_attackpats.db $(srcdir)/aa_attackpats.dtr mkpat$(EXEEXT)
         ./mkpat $(DFAFLAGS) -b -t $(srcdir)/aa_attackpats.dtr aa_attackpat \
@@ -574 +582 @@
                -i $(srcdir)/owl_defendpats.db -o owl_defendpat.c
 
 fusekipat.c : $(srcdir)/fuseki.db mkpat$(EXEEXT)
-        ./mkpat -b fusekipat -i $(srcdir)/fuseki.db -o fusekipat.c
+        ./mkpat -b -m fusekipat -i $(srcdir)/fuseki.db -o fusekipat.c
 
 fuseki9.c : $(srcdir)/fuseki9.dbz uncompress_fuseki$(EXEEXT)
         ./uncompress_fuseki 9 $(srcdir)/fuseki9.dbz c >fuseki9.c
@@ -585 +593 @@
 fuseki19.c : $(srcdir)/fuseki19.dbz uncompress_fuseki$(EXEEXT)
         ./uncompress_fuseki 19 $(srcdir)/fuseki19.dbz c >fuseki19.c
 
-handipat.c : $(srcdir)/handicap.db mkpat$(EXEEXT)
-        ./mkpat -b handipat -i $(srcdir)/handicap.db -o handipat.c
+handipat.c : $(srcdir)/handicap.db $(srcdir)/handicap.dtr mkpat$(EXEEXT)
+        ./mkpat $(DFAFLAGS) -b -t $(srcdir)/handicap.dtr handipat \
+               -i $(srcdir)/handicap.db -o handipat.c
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

patterns/dfa.c

@@ -416 +416 @@
     exit(EXIT_FAILURE);
   }
 
-  assert(dfa_minmax_delta(pdfa, -1, 1) > -32768);
-  if (dfa_minmax_delta(pdfa, -1, 0)  > 32768) {
-    fprintf(of, "#error too many states");
-    fprintf(stderr, "Error: The dfa states are too disperse. Can't fit delta into a short.\n");
-    exit(EXIT_FAILURE);
-  }
-
   if (pdfa->last_index + 1 > 65535) {
     fprintf(of, "#error too many states");
     fprintf(stderr, "Error: Too many index entries. Can't fit delta into a short.\n");
@@ -439 +432 @@
     fprintf(of, "{{");
     for (j = 0; j < 4; j++) {
       int n = pdfa->states[i].next[j];
-      assert((n == 0) || (abs(n - i) < 32768));
-      fprintf(of, "%d", n ? n - i : 0);
+      assert((n >= 0) && (n <= 65535));
+      fprintf(of, "%d", n);
       if (j != 3)
         fprintf(of, ",");
     }
@@ -778 +771 @@
 }
 
 
-/*
- * Returns max or min jump distance from state to next[next_index] for
- * all states.  If next_index < 0, then max/min for all for states.
- */
-
-int 
-dfa_minmax_delta(dfa_t *pdfa, int next_index, int isMin)
-{
-
-  int ret, i, j;
-  assert(next_index <= 3);
- 
-  if (isMin)
-    ret = 99999;
-  else
-    ret = -1;
-
-  for (i = 0; i <= pdfa->last_state; i++) {
-    for (j = 0; j < 4; j++) {
-      if (j == next_index || next_index < 0) { 
-        int next = pdfa->states[i].next[j];
-        if (!next)
-          continue;
-        if (isMin) {
-          if (ret > next - i)
-            ret = next - i;
-        }
-        else {
-          if (ret < next - i)
-            ret = next - i;
-        }
-      }
-    }
-  }
-
-  return ret;
-}
-
 #define DFA_ALIGN       2
 
 /*
@@ -947 +902 @@
 dfa_finalize(dfa_t *pdfa) 
 {
   int j;
-  int next_bin = aux_count;
-  int last_bin = aux_count + DFA_BINS - 1;
+  int next_bin;
+  int last_bin;
+  aux_count += DFA_BINS; /* To avoid negative values of aux_count. */
+  next_bin = aux_count;
+  last_bin = aux_count + DFA_BINS - 1;
   while (next_bin + 1 != last_bin) {
     for (j = aux_count + 1; j <= last_bin; j += 2) {
       if (j+1 == next_bin)
@@ -1190 +1148 @@
     if (j == pat->minj)
       borders &= ~WEST_EDGE;
     
-    assert(m + i < DFA_MAX_BOARD * 3 && m + i < DFA_MAX_BOARD * 3);
+    assert(m + i < DFA_MAX_BOARD * 4 && n + j < DFA_MAX_BOARD * 4);
     str[k] = work_space[m + i][n + j];
     assert(strchr("XOxo.,a!?$#|-+", str[k]));
     

patterns/dfa.h

@@ -65 +65 @@
 /* DFA state. */
 typedef struct state_rt
 {
-  short next[4];
-  short att;
+  unsigned short next[4]; /* Next state to jump to. */
+  short att;              /* An index in the attributes table. */
 } state_rt_t;
 
 typedef struct dfa_rt

patterns/mkpat.c

@@ -55 +55 @@
         -p = compile general pattern database (the default)\n\
         -c = compile connections database\n\
         -C = compile a corner pattern database\n\
+  Usage of DFA (cannot be used with a corner pattern database):\n\
         -D = compile a DFA database (allows fast matching)\n\
         -d <iterations> = don't generate database, but optimize a DFA\n\
                           transformation file instead\n\
@@ -91 +92 @@
 #define DB_GENERAL      ((int) 'p')
 #define DB_CONNECTIONS  ((int) 'c')
 #define DB_CORNER       ((int) 'C')
-#define DB_DFA          ((int) 'D')
+#define USE_DFA         ((int) 'D')
 #define OPTIMIZE_DFA    ((int) 'd')
 
 /* code assumes that ATT_O and ATT_X are 1 and 2 (in either order)
@@ -150 +151 @@
 
 static int ci = -1, cj = -1;    /* position of origin (first piece element)
                                    relative to top-left */
+static int fixed_pat_anchor = 0; /* if anchor for checked pattern is fixed */
 static int patno;               /* current pattern */
 static int discard_pattern = 0; /* Set to nonzero to discard a pattern (if e.g.
                                  * it is too large or duplicated). */
@@ -482 +484 @@
 
 /* options */
 int verbose = 0;               /* -v */
-static int database_type = 0;  /* -p (default), -c, -f, -C, -D or -T */
+static int database_type = 0;  /* -p (default), -c or -C */
+static int use_dfa = 0;        /* -D or -d */
 static int anchor = 0;         /* Whether both O and/or X may be anchors.
                                 * -b for both. -X for only X.
                                 */
@@ -536 +539 @@
 {
   struct hint_data *hint;
 
-  if (database_type == DB_DFA || database_type == OPTIMIZE_DFA) {
+  if (use_dfa) {
     for (hint = first_hint; hint; hint = hint->next) {
       if (!strcmp(hint->name, pattern_name))
         return hint->transformation_hint;
     }
   }
 
-  return database_type == OPTIMIZE_DFA ? -1 : 0;
+  return use_dfa == OPTIMIZE_DFA ? -1 : 0;
 }
 
 
@@ -695 +698 @@
   if (verbose)
     fprintf(stderr, "Add   :%s\n", pattern[index].name);
 
-  if (database_type == DB_DFA) {
+  if (use_dfa == USE_DFA) {
     float ratio;
 
     dfa_rotate_string(strrot, str, transformation_hint);
@@ -718 +721 @@
     int rot_start = 0;
     int rot_stop = pattern[index].trfno;
 
-    assert(database_type == OPTIMIZE_DFA);
+    assert(use_dfa == OPTIMIZE_DFA);
 
     if (rot_stop == 5) {
       rot_start = 2;
@@ -889 +892 @@
     }
 
     if (off == ATT_Q) {
+      fixed_pat_anchor = 1;
       off = ATT_O;
       ci = maxi;
       cj = j;
@@ -897 +901 @@
     }
 
     if (off == ATT_Y) {
+      fixed_pat_anchor = 1;
       off = ATT_X;
       ci = maxi;
       cj = j;
@@ -1098 +1103 @@
     ci = 0;
     cj = 0;
   }
-  else if (choose_best_anchor && !discard_pattern) { 
+  else if (choose_best_anchor && !discard_pattern
+           && (!fixed_pat_anchor || database_type != DB_CONNECTIONS)) {
 
     /* Try to find a better anchor if
      * the -m option is set.
@@ -1775 +1781 @@
   int used_nodes = 0;
 
   assert(ci != -1 && cj != -1);
-  assert(database_type == DB_DFA || transformation_hint == 0);
+  assert(use_dfa == USE_DFA || transformation_hint == 0);
 
   /* sort the elements so that least-likely elements are tested first. */
   gg_sort(elements, el, sizeof(struct patval_b), compare_elements);
@@ -1816 +1822 @@
        * elements for all possible transformations).
        */
       if ((database_type == DB_GENERAL || database_type == DB_CONNECTIONS)
-          && ci-1 <= x && x <= ci+1 && cj-1 <= y && y <= cj+1)
+          && !use_dfa && ci-1 <= x && x <= ci+1 && cj-1 <= y && y <= cj+1)
         continue;
 #endif /* GRID_OPT == 1 */
 
@@ -1824 +1830 @@
        * they might be needed for goal checking or by callback function, so
        * we check it before discarding an element.
        */
-      if (database_type == DB_DFA)
+      if (use_dfa)
         continue;
     } /* If the element is discardable. */
 
@@ -2384 +2390 @@
   fprintf(outfile, "  -1,\n");  /* fixed_for_size */
   fprintf(outfile, "  %d,\n", fixed_anchor);
   fprintf(outfile, "  %s\n", prefix);
-  if (database_type == DB_DFA)
+  if (use_dfa)
     fprintf(outfile, " ,& dfa_%s\n", prefix); /* pointer to the wired dfa */
   else
     fprintf(outfile, " , NULL\n"); /* pointer to a possible dfa */
@@ -2434 +2440 @@
 
       case 'p':
       case 'c':
-      case 'f':
       case 'C':
-      case 'D':
-      case 'd':
         if (database_type) {
           fprintf(stderr, "Error : More than one database type specified (-%c and -%c)\n",
                   database_type, i);
           return 1;
         }
+        if (i == 'C' && use_dfa) {
+          fprintf(stderr, "Error : Cannot use DFA with a corner pattern database\n");
+          return 1;
+        }
         database_type = i;
+        break;
+
+      case 'd':
+      case 'D':
+        use_dfa = i;
         if (i == 'd') {
           iterations = strtol(gg_optarg, NULL, 10);
           if (iterations < 0) {
@@ -2451 +2463 @@
             return 1;
           }
         }
+        if (database_type == 'C') {
+          fprintf(stderr, "Error : Cannot use DFA with a corner pattern database\n");
+          return 1;
+        }
         break;
 
       case 'O':
@@ -2492 +2508 @@
 
     if (!input_files)
       input_file_names[input_files++] = stdin_name;
-    if (output_file_name && database_type != OPTIMIZE_DFA) {
+    if (output_file_name && use_dfa != OPTIMIZE_DFA) {
       output_FILE = fopen(output_file_name, "wb");
       if (output_FILE == NULL) {
         fprintf(stderr, "Error : Cannot write to file %s\n", output_file_name);
         return 1;
       }
     }
-    if (transformations_file_name
-        && (database_type == DB_DFA || database_type == OPTIMIZE_DFA)) {
+    if (transformations_file_name && use_dfa) {
       transformations_FILE = fopen(transformations_file_name, "r");
       if (transformations_FILE) {
         parse_transformations_file(transformations_FILE);
         fclose(transformations_FILE);
       }
-      else if (database_type == DB_DFA) {
+      else if (use_dfa == USE_DFA) {
         fprintf(stderr, "Error : Cannot read file %s\n",
                 transformations_file_name);
         return 1;
@@ -2524 +2539 @@
 
   prefix = argv[gg_optind];
 
-  if (database_type == DB_DFA) {
+  if (use_dfa == USE_DFA) {
     dfa_init();
     new_dfa(&dfa, "mkpat's dfa");
   }
   else if (database_type == DB_CORNER)
     corner_init();
 
-  if (database_type == OPTIMIZE_DFA) {
+  if (use_dfa == OPTIMIZE_DFA) {
     if (transformations_file_name == NULL) {
       fprintf(stderr, "error : transformation file required (use -t option)\n");
       return 1;
@@ -2817 +2832 @@
       else if (line[0] == ':') {
         if (state == 2 || state == 3) {
           finish_pattern(line);
+          fixed_pat_anchor = 0;
           
           if (!discard_pattern) {
-            if (database_type == DB_DFA || database_type == OPTIMIZE_DFA)
+            if (use_dfa)
               write_to_dfa(patno);
             if (database_type == DB_CORNER)
               corner_add_pattern();
-            else if (database_type != OPTIMIZE_DFA)
+            else if (use_dfa != OPTIMIZE_DFA)
               write_elements(output_FILE);
           }
 
@@ -2916 +2932 @@
     fprintf(stderr, "%d / %d patterns have edge-constraints\n",
             pats_with_constraints, patno);
 
-  if (database_type != OPTIMIZE_DFA) {
+  if (use_dfa != OPTIMIZE_DFA) {
     /* Forward declaration, which autohelpers might need. */
     if (database_type != DB_CORNER)
       fprintf(output_FILE, "static struct pattern %s[%d];\n\n", prefix, patno + 1);
@@ -2933 +2949 @@
 
     write_patterns(output_FILE);
 
-    if (database_type == DB_DFA) {
+    if (use_dfa) {
       fprintf(stderr, "---------------------------\n");
 
       dfa_finalize(&dfa);
@@ -2976 +2992 @@
               current_file);
     }
   }
-  else {        /* database_type == OPTIMIZE_DFA */
+  else {        /* use_dfa == OPTIMIZE_DFA */
     int k;
     int *optimized_variations;
 
@@ -2989 +3005 @@
     optimized_variations = dfa_patterns_optimize_variations(&dfa_pats,
                                                             iterations);
     for (k = 0; k < patno; k++) {
-      fprintf(transformations_FILE, "%s\t%d\n", pattern_names[k],
-              optimized_variations[k]);
+      int var = optimized_variations[k];
+      if (pattern[k].trfno == 5)
+        var += 2;
+      fprintf(transformations_FILE, "%s\t%d\n", pattern_names[k], var);
     }
 
     free(optimized_variations);

(a) /dev/null vs. (b) patterns/attack.dtr

@@ +1 @@
+Attack1 0
+Attack2 0
+Attack4 2
+Attack5 0
+Attack6 6
+Attack10        0
+Attack11        6
+Attack13        1
+Attack14        2
+Attack15        0
+Attack16        5
+Attack17        0
+Attack18        6
+Attack19        4

(a) /dev/null vs. (b) patterns/barriers.dtr

@@ +1 @@
+Barrier1        1
+Barrier1b       1
+Barrier2        1
+Barrier3        1
+Barrier4a       3
+Barrier4b       4
+Barrier5        0
+Barrier6        7
+Barrier6b       0
+Barrier7        0
+Barrier8        1
+Barrier9        1
+Barrier10       0
+Barrier11       0
+Barrier12       6
+Barrier13       0
+Barrier14       0
+Barrier15       6
+Barrier16       5
+Barrier16b      6
+Barrier17       6
+Barrier18       6
+Barrier19       0
+Barrier20       0
+Barrier21       1
+Barrier22       0
+Barrier22a      6
+Barrier22b      0
+Barrier23       5
+Barrier24       0
+Barrier25       6
+Barrier26       5
+Barrier27       0
+Barrier28       0
+Barrier29       7
+Barrier30       0
+Barrier31       0
+Barrier32       7
+Barrier33       0
+Barrier34       7
+Barrier34b      0
+Barrier35       0
+Barrier36       0
+Barrier37       7
+Barrier38       7
+Barrier39       6
+Barrier40       0
+Barrier41a      3
+Barrier41b      3
+Barrier42       7
+Barrier43       6
+Barrier44       0
+Barrier45       0
+Barrier46       6
+Barrier47       0
+Barrier48       0
+Barrier49       0
+Barrier50       0
+Barrier51       5
+Barrier52       7
+Barrier53       7
+Barrier54       0
+Barrier55       6
+Barrier56      &nb