Fix translation mistake in SA construction

Author: fasterthanlime

.gitignore

@@ -1,3 +1,4 @@
 /target
+/testdata
 /crosscheck
 **/*.rs.bk

original/divsufsort_private.h

@@ -156,17 +156,29 @@ extern FILE *CROSSCHECK_FILE;
 #define SA_dump(SA, label) \
   do { \
     fprintf(CROSSCHECK_FILE, ":: %s\n", label); \
-    fprintf(CROSSCHECK_FILE, "SA = ["); \
     for (int z = 0; z < n; z++) { \
-      if (z == n - 1) { \
-        fprintf(CROSSCHECK_FILE, "%d", SA[z]); \
-      } else { \
-        fprintf(CROSSCHECK_FILE, "%d, ", SA[z]); \
+      fprintf(CROSSCHECK_FILE, "%d=%d ", z, SA[z]); \
+      if ((z+1)%25==0) { \
+        fprintf(CROSSCHECK_FILE, "\n"); \
       } \
     } \
-    fprintf(CROSSCHECK_FILE, "]\n"); \
+    fprintf(CROSSCHECK_FILE, "\n"); \
   } while (0);
 
+// #define SA_dump(SA, label) \
+//   do { \
+//     fprintf(CROSSCHECK_FILE, ":: %s\n", label); \
+//     fprintf(CROSSCHECK_FILE, "SA = ["); \
+//     for (int z = 0; z < n; z++) { \
+//       if (z == n - 1) { \
+//         fprintf(CROSSCHECK_FILE, "%d", SA[z]); \
+//       } else { \
+//         fprintf(CROSSCHECK_FILE, "%d, ", SA[z]); \
+//       } \
+//     } \
+//     fprintf(CROSSCHECK_FILE, "]\n"); \
+//   } while (0);
+
 #define A_dump(A, label) \
   do { \
     fprintf(CROSSCHECK_FILE, ":: %s\n", label); \

src/crosscheck.rs

@@ -32,8 +32,18 @@ pub fn flush() {
 pub fn SA_dump(SA: &SuffixArray, label: &str) {
     #[cfg(debug_assertions)]
     {
-        crosscheck!(":: {}", label);
-        crosscheck!("SA = {:?}", SA.0);
+        use std::io::Write;
+        let mut f = crate::crosscheck::CROSSCHECK_FILE.lock().unwrap();
+
+        writeln!(f, ":: {}", label).unwrap();
+        // crosscheck!("SA = {:?}", SA.0);
+        for i in 0..SA.0.len() {
+            write!(f, "{}={} ", i, SA.0[i]).unwrap();
+            if (i + 1) % 25 == 0 {
+                writeln!(f, "").unwrap();
+            }
+        }
+        writeln!(f, "").unwrap();
     }
 }
 
@@ -48,10 +58,13 @@ pub fn A_dump(A: &ABucket, label: &str) {
 pub fn BSTAR_dump(B: &mut BMixBucket, label: &str) {
     #[cfg(debug_assertions)]
     {
-        crosscheck!("{} B* dump:", label);
+        use std::io::Write;
+        let mut f = crate::crosscheck::CROSSCHECK_FILE.lock().unwrap();
+
+        writeln!(f, "{} B* dump:", label).unwrap();
         for ii in 0..(ALPHABET_SIZE as Idx) {
             for jj in 0..(ALPHABET_SIZE as Idx) {
-                crosscheck!("{} B*[{},{}]={}", label, ii, jj, B.bstar()[(ii, jj)]);
+                writeln!(f, "{} B*[{},{}]={}", label, ii, jj, B.bstar()[(ii, jj)]).unwrap();
             }
         }
     }

src/divsufsort.rs

@@ -474,7 +474,7 @@ fn construct_SA(T: &Text, SA: &mut SuffixArray, mut A: ABucket, mut B: BMixBucke
     // Construct the suffix array by using the sorted order of type B suffixes
     c2 = T.get(n - 1);
     k = A[c2];
-    SA[k] = if T.get(n - 1) < c2 { !(n - 1) } else { n - 1 };
+    SA[k] = if T.get(n - 2) < c2 { !(n - 1) } else { n - 1 };
     k += 1;
     // Scan the suffix array from left to right
     {