-keep track of messages passed to mq

[oweals/gnunet.git] / src / sensor / plugin_sensor_model_gaussian.c

diff --git a/src/sensor/plugin_sensor_model_gaussian.c b/src/sensor/plugin_sensor_model_gaussian.c
index 8b4b090891edefafa79ec8bc7e14a26729256294..a55b4d5941f2e1fd47197dc6e5c7d3d194ef5177 100644 (file)
--- a/src/sensor/plugin_sensor_model_gaussian.c
+++ b/src/sensor/plugin_sensor_model_gaussian.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of GNUnet
- * (C) 2013 Christian Grothoff (and other contributing authors)
+ * Copyright (C) 2013 Christian Grothoff (and other contributing authors)
  *
  * GNUnet is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
@@ -14,11 +14,11 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with GNUnet; see the file COPYING.  If not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
-/*
+/**
  * @file sensor/plugin_sensor_model_gaussian.c
  * @brief Gaussian model for sensor analysis
  * @author Omar Tarabai
@@ -31,54 +31,59 @@
 
 #define LOG(kind,...) GNUNET_log_from (kind, "sensor-model-gaussian", __VA_ARGS__)
 
-/*
+/**
  * Plugin state information
  */
 struct Plugin
 {
 
-  /*
+  /**
    * Configuration handle
    */
   const struct GNUNET_CONFIGURATION_Handle *cfg;
 
-  /*
+  /**
    * Number of initial readings to be used for training only
    */
   int training_window;
 
-  /*
+  /**
    * Number of standard deviations considered within "normal"
    */
   int confidence_interval;
 
+  /**
+   * Increase in weight with each reading
+   */
+  float weight_inc;
+
 };
 
-/*
+/**
  * State of single model instance
  */
 struct Model
 {
 
-  /*
+  /**
    * Pointer to the plugin state
    */
   struct Plugin *plugin;
 
-  /*
-   * Number of readings so far
+  /**
+   * Gaussian sums
    */
-  int n;
+  long double s[3];
 
-  /*
-   * Sum of readings
+  /**
+   * Number of readings so far
    */
-  long double sum;
+  int n;
 
-  /*
-   * Sum square of readings
+  /**
+   * Weight to be used for the next reading
    */
-  long double sumsq;
+  double w;
 
 };
 
@@ -91,8 +96,11 @@ struct Model
 static void
 update_sums (struct Model *model, double val)
 {
-  model->sum += val;
-  model->sumsq += val * val;
+  int i;
+
+  for (i = 0; i < 3; i++)
+    model->s[i] += model->w * pow (val, (double) i);
+  model->w += model->plugin->weight_inc;
   model->n++;
 }
 
@@ -120,10 +128,13 @@ sensor_gaussian_model_feed (void *cls, double val)
   }
   if (model->n == plugin->training_window)
     LOG (GNUNET_ERROR_TYPE_DEBUG, "Gaussian model out of training period.\n");
-  mean = model->sum / model->n;
+  mean = model->s[1] / model->s[0];
   stddev =
-      sqrt ((model->sumsq - 2 * mean * model->sum +
-             model->n * mean * mean) / (model->n - 1));
+      (model->s[0] * model->s[2] -
+       model->s[1] * model->s[1]) / (model->s[0] * (model->s[0] - 1));
+  if (stddev < 0)               /* Value can be slightly less than 0 due to rounding errors */
+    stddev = 0;
+  stddev = sqrt (stddev);
   allowed_variance = (plugin->confidence_interval * stddev);
   if ((val < (mean - allowed_variance)) || (val > (mean + allowed_variance)))
     return GNUNET_YES;
@@ -161,6 +172,7 @@ sensor_gaussian_model_create_model (void *cls)
   model = GNUNET_new (struct Model);
 
   model->plugin = plugin;
+  model->w = 1;
   return model;
 }
 
@@ -191,7 +203,16 @@ libgnunet_plugin_sensor_model_gaussian_init (void *cls)
          _("Missing `TRAINING_WINDOW' value in configuration.\n"));
     return NULL;
   }
-  plugin.training_window = (int) num;
+  if (num < 1)
+  {
+    LOG (GNUNET_ERROR_TYPE_WARNING,
+         "Minimum training window invalid (<1), setting to 1.\n");
+    plugin.training_window = 1;
+  }
+  else
+  {
+    plugin.training_window = (int) num;
+  }
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_number (cfg, "sensor-model-gaussian",
                                              "CONFIDENCE_INTERVAL", &num))
@@ -200,6 +221,14 @@ libgnunet_plugin_sensor_model_gaussian_init (void *cls)
          _("Missing `CONFIDENCE_INTERVAL' value in configuration.\n"));
     return NULL;
   }
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_float (cfg, "sensor-model-gaussian",
+                                            "WEIGHT_INC", &plugin.weight_inc))
+  {
+    LOG (GNUNET_ERROR_TYPE_ERROR,
+         _("Missing `WEIGHT_INC' value in configuration.\n"));
+    return NULL;
+  }
   plugin.confidence_interval = (int) num;
   api = GNUNET_new (struct GNUNET_SENSOR_ModelFunctions);