comparison base/ColumnOp.cpp @ 1527:710e6250a401 zoom

Merge from default branch

 ColumnOp::normalize(const Column &in, ColumnNormalization n) {
 
     if (n == ColumnNormalization::None || in.empty()) {
         return in;
     }
-
+    
+    float shift = 0.f;
     float scale = 1.f;
-        
-    if (n == ColumnNormalization::Sum1) {
+
+    if (n == ColumnNormalization::Range01) {
+
+        float min = 0.f;
+        float max = 0.f;
+        bool have = false;
+        for (auto v: in) {
+            if (v < min || !have) {
+                min = v;
+            }
+            if (v > max || !have) {
+                max = v;
+            }
+            have = true;
+        }
+        if (min != 0.f) {
+            shift = -min;
+            max -= min;
+        }
+        if (max != 0.f) {
+            scale = 1.f / max;
+        }
+
+    } else if (n == ColumnNormalization::Sum1) {
 
         float sum = 0.f;
 
         for (auto v: in) {
             sum += fabsf(v);

                 scale = log10f(max + 1.f) / max;
             }
         }
     }
 
-    return applyGain(in, scale);
+    return applyGain(applyShift(in, shift), scale);
 }
 
 ColumnOp::Column
 ColumnOp::distribute(const Column &in,
                      int h,