From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 2 Nov 2014 04:49:57 +0000 (-0700)
Subject: Major improvement in data dumping (152 down to 14 faults) despite regressions.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cbf9a757224ee2dc0c083bbc7c3db9a74567b29;p=pspp

Major improvement in data dumping (152 down to 14 faults) despite regressions.
---

diff --git a/dump.c b/dump.c
index 6f567bcd7d..73bed134c0 100644
--- a/dump.c
+++ b/dump.c
@@ -641,11 +641,11 @@ dump_dim(void)
     dump_category (0);
 }
 
+int n_dims;
 static void
 dump_dims(void)
 {
-  int n_dims = get_u32();
-
+  n_dims = get_u32();
   printf ("%u dimensions\n", n_dims);
   for (int i = 0; i < n_dims; i++)
     {
@@ -658,14 +658,16 @@ static void
 dump_data(void)
 {
 #if 1
-  if (!match_u32 (0) || !match_u32 (1) || !match_u32(1) || !match_u32(0) || (!match_u32(1) && !match_u32(13)))
-    {
-      printf ("skipping data\n");
-      return;
-    }
+  int a[16];
+  for (int i = 0; i < 3 + n_dims; i++)
+    a[i] = get_u32();
+  printf ("data intro:");
+  for (int i = 0; i < 3 + n_dims; i++)
+    printf(" %d", a[i]);
+  printf("\n");
 #else
-  fprintf (stderr,"data intro:");
-  for (int i = 0; i < 5; i++)
+  fprintf (stderr,"data intro (%d dims):", n_dims);
+  for (int i = 0; i < 3+n_dims; i++)
     fprintf (stderr," %d", get_u32());
   fprintf(stderr,"\n");
 #endif
diff --git a/notes b/notes
index b3dfe7d2d0..0fe0b26312 100644
--- a/notes
+++ b/notes
@@ -1472,6 +1472,17 @@ germano/Crosstabs/00000000014_lightTableData.bin (Crosstabulation):
     80 i1 00 00 00 01 58 F40.0(12)
     i8 00 00 00 00 01 i49 00 i1 "a" i11 i5 00 00 00 00 58 58 58 F40.0(5)
 
+web/1fe57275203d4c8b7eca5bd796738e71/00000000014_lightTableData.bin (Correlation Matrix):
+
+    i1 i2 00 00 00 00 00 00 00 00 00 00 00 00 i2 i1 00 00 00 00 i2 i1 10 01 00 00 i17 00 00 00 00 01 58 F40.3(0.043)
+    i34 00 00 00 00 01 58 F40.3(0.318)
+    i51 00 00 00 00 01 58 F40.3(0.486)
+    i68 00 00 00 00 01 58 F40.3(0.226)
+    i85 00 00 00 00 01 58 F40.3(0.183)
+    i102 00 00 00 00 01 58 F40.3(0.278)
+    i119 00 00 00 00 01 58 F40.3(0.275)
+    i136 00 00 00 00 01 58 F40.3(0.019)
+
 
 Data: tdump21 (germano/Crosstabs.pdf)
 -------------