From 4b1d21b6c22cf27a8dadd5ce191d0dde4baa3b06 Mon Sep 17 00:00:00 2001
From: wukong <wukong@longaeva>
Date: Wed, 6 Jun 2018 01:59:22 -0700
Subject: Small merges for code consistency.

---
 conv.awk        | 1 -
 diff1.awk       | 2 ++
 kalman.awk      | 4 ++--
 kalman_init.awk | 7 +++++--
 lin_reg.awk     | 4 ++--
 lin_reg2.awk    | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/conv.awk b/conv.awk
index 10c99c7..73e176e 100644
--- a/conv.awk
+++ b/conv.awk
@@ -1,7 +1,6 @@
 ### conv.awk
 # [PoC] linear convolution (with hardcoded IR window).
 
-
 BEGIN {
     X = ARGV[1]
     input_size = split(X, X_arr)
diff --git a/diff1.awk b/diff1.awk
index 1032659..e5e8fea 100644
--- a/diff1.awk
+++ b/diff1.awk
@@ -27,10 +27,12 @@ NF != 0 {
     ### iterate over columns
     for (y=1; y<=max_nf; y++) {
         if ($y ~ number) {
+
             data[y] = $y
             diff[y] = data[y] - data_prev[y]
             printf("%g,", diff[y])
             data_prev[y] = data[y]
+
         }
     }
     printf("\n")
diff --git a/kalman.awk b/kalman.awk
index 9eb6f79..18279b1 100644
--- a/kalman.awk
+++ b/kalman.awk
@@ -15,7 +15,7 @@ NR == 1 {
         if ($n !~ number)
             header[n] = $n
         else
-            header[n] = n
+            header[n] = "col_" n
     }
 }
 
@@ -25,7 +25,7 @@ NF != 0 {
         max_nf = NF
 
     ### iterate over columns
-    for (y=1; y<= NF; y++) {
+    for (y=1; y<=max_nf; y++) {
         if ($y ~ number) {
 
             ### mean
diff --git a/kalman_init.awk b/kalman_init.awk
index a63a864..331d99a 100644
--- a/kalman_init.awk
+++ b/kalman_init.awk
@@ -15,7 +15,9 @@ NR == 1 {
     header_nf = NF
     for (n=1; n<=NF; n++) {
         if ($n !~ number)
-            header[n] = $n
+            header[n] = "d" $n
+        else
+            header[n] = "col_" n
     }
 }
 
@@ -25,7 +27,8 @@ NF != 0 {
     if (NF > max_nf)
         max_nf = NF
 
-    for (n=1; n <= NF; n++) {
+    ### iterate over columns
+    for (n=1; n<=max_nf; n++) {
         if ($n ~ number) {
             count[n] = ($n ~ number) + (last[n] ~ number) + (last2[n] ~ number)
             diff[n] = $n - last[n]
diff --git a/lin_reg.awk b/lin_reg.awk
index d950f80..66d8aa6 100644
--- a/lin_reg.awk
+++ b/lin_reg.awk
@@ -15,7 +15,7 @@ NR == 1 {
         if ($n !~ number)
             header[n] = $n
         else
-            header[n] = n
+            header[n] = "col_" n
     }
 }
 
@@ -25,7 +25,7 @@ NF != 0 {
         max_nf = NF
 
     ### iterate over columns
-    for (y=1; y<=NF; y++) {
+    for (y=1; y<=max_nf; y++) {
         if ($y ~ number) {
 
             ### mean
diff --git a/lin_reg2.awk b/lin_reg2.awk
index a66c78f..1f9ad31 100644
--- a/lin_reg2.awk
+++ b/lin_reg2.awk
@@ -25,7 +25,7 @@ NF != 0 {
         max_nf = NF
 
     ### iterate over columns
-    for (y=1; y<= NF; y++) {
+    for (y=1; y<=max_nf; y++) {
         if ($y ~ number) {
 
             ### mean
-- 
cgit v1.2.3