[Avida-SVN] r2118 - branches/energy/source/main

[beckma24 at myxo.css.msu.edu]

Author: beckma24
Date: 2007-10-02 08:47:30 -0400 (Tue, 02 Oct 2007)
New Revision: 2118

Modified:
   branches/energy/source/main/cOrgMessagePredicate.h
   branches/energy/source/main/cStats.cc
Log:
Minor changes to PrintPredSatFracDump

Modified: branches/energy/source/main/cOrgMessagePredicate.h
===================================================================
--- branches/energy/source/main/cOrgMessagePredicate.h	2007-09-28 11:58:01 UTC (rev 2117)
+++ branches/energy/source/main/cOrgMessagePredicate.h	2007-10-02 12:47:30 UTC (rev 2118)
@@ -153,6 +153,7 @@
   cOrgMessagePred_EventReceived(cDemeCellEvent* event, int base_station) : 
   m_base_station(base_station)
   , m_event_received(false)
+  , m_stats_updated(false)
   , m_event(event){ }
   
   ~cOrgMessagePred_EventReceived() { }
@@ -182,6 +183,7 @@
   
   virtual void Reset() { 
     m_event_received = false;
+    m_stats_updated = false;
     m_cell_ids.clear();
   }
 
@@ -194,17 +196,19 @@
   }
 
   virtual void UpdateStats(cStats& stats) {
-    if(m_event_received) {
+    if(m_event_received && m_stats_updated) {
       int eventCell = m_event->GetNextEventCellID();
       while(eventCell != -1) {
         stats.IncPredSat(eventCell);
         eventCell = m_event->GetNextEventCellID();
       }
+      m_stats_updated = true;
     }
   }
   
   int m_base_station;
   bool m_event_received;
+  bool m_stats_updated;
   cDemeCellEvent* m_event;
   std::set<int> m_cell_ids;
 };

Modified: branches/energy/source/main/cStats.cc
===================================================================
--- branches/energy/source/main/cStats.cc	2007-09-28 11:58:01 UTC (rev 2117)
+++ branches/energy/source/main/cStats.cc	2007-10-02 12:47:30 UTC (rev 2118)
@@ -1160,7 +1160,7 @@
       if(relative_pos_event_count.ElementAt(x,y) == 0) {
         data = 0.0;
       } else {
-        data = relative_pos_pred_sat.ElementAt(x,y) / relative_pos_event_count.ElementAt(x,y);
+        data = (double) relative_pos_pred_sat.ElementAt(x,y) / (double) relative_pos_event_count.ElementAt(x,y);
       }
 //        df.Write(data, "hello");
       df.WriteBlockElement(data, x*cols+y, cols);