1 files changed, 55 insertions, 6 deletions

diff --git a/projectionobserver.cpp b/projectionobserver.cpp
index 781aba9..e500755 100644
--- a/projectionobserver.cpp
+++ b/projectionobserver.cpp
@@ -2,8 +2,12 @@
 
 #include <cmath>
 
+#include <QDebug>
+
 #include "mp.h"
 
+static const float EPSILON = 1e-6f;
+
 static void aggregatedError(const arma::mat &distX, const arma::mat &distY, arma::vec &v)
 {
     double maxX = distX.max();
@@ -17,37 +21,82 @@ static void aggregatedError(const arma::mat &distX, const arma::mat &distY, arma
                 continue;
             }
 
-            v[i] += fabs(distY(i, j) / maxY - distX(i, j) / maxX);
+            float diff = fabs(distY(i, j) / maxY - distX(i, j) / maxX);
+            if (diff < EPSILON) {
+                continue;
+            }
+
+            v[i] += diff;
         }
     }
 }
 
 ProjectionObserver::ProjectionObserver(const arma::mat &X,
                                        const arma::uvec &cpIndices)
-    : m_X(X)
+    : m_type(OBSERVER_CURRENT)
+    , m_X(X)
     , m_cpIndices(cpIndices)
 {
     m_distX = mp::dist(m_X);
     m_values.set_size(m_X.n_rows);
 }
 
+bool ProjectionObserver::setType(int type)
+{
+    if (m_type == type) {
+        return true;
+    }
+
+    if (type != OBSERVER_DIFF_PREVIOUS || m_prevValues.n_elem != 0) {
+        m_type = type;
+        return emitValuesChanged();
+    }
+
+    return false;
+}
+
 void ProjectionObserver::setMap(const arma::mat &Y)
 {
     // update previous map
     if (m_prevY.n_elem == 0 && m_Y.n_elem > 0) {
         m_prevY = m_Y;
-        m_distPrevY = m_distY;
+        m_prevDistY = m_distY;
+        m_prevValues = m_values;
     }
 
     m_Y = Y;
     m_distY = mp::dist(Y);
+    aggregatedError(m_distX, m_distY, m_values);
 
     // method called for the first time; set original Y
     if (m_origY.n_elem == 0) {
         m_origY = m_Y;
-        m_distOrigY = m_distY;
+        m_origDistY = m_distY;
+        m_origValues = m_values;
     }
 
-    aggregatedError(m_distX, m_distY, m_values);
-    emit mapChanged(m_values);
+    emitValuesChanged();
+}
+
+bool ProjectionObserver::emitValuesChanged() const
+{
+    switch (m_type) {
+    case OBSERVER_CURRENT:
+        emit valuesChanged(m_values);
+        return true;
+    case OBSERVER_DIFF_PREVIOUS:
+        if (m_prevValues.n_elem > 0) {
+            emit valuesChanged(m_values - m_prevValues);
+            return true;
+        }
+        return false;
+    case OBSERVER_DIFF_ORIGINAL:
+        if (m_origValues.n_elem > 0) {
+            emit valuesChanged(m_values - m_origValues);
+            return true;
+        }
+        return false;
+    default:
+        return false;
+    }
 }