Changeset 201 for trunk/src

Timestamp:

04/05/09 09:21:44 (4 years ago)

Author:

guyru

Message:

Re-factor the Statistics constructor to use exceptions

Location:

trunk/src

Files:

• statistics.cpp (modified) (3 diffs)
• statistics.h (modified) (3 diffs)

trunk/src/statistics.cpp

@@ -34 +34 @@
 Statistics::Statistics(configuration::Configuration *backend)
 {
+        try {
+                load_data();
+        } catch (exception &e) {
+                reset();
+        }
+}
+
+void Statistics::load_data() 
+{
         string tmp;
         vector<string> tmp_vec;
@@ -46 +55 @@
         tmp = backend->get("statistics_score_distribution");
         split(tmp_vec, tmp, is_any_of(","));
-        if (tmp_vec.size() != score_distributions_slots) {
-                reset();
-                return;
-        }
+        if (tmp_vec.size() != score_distributions_slots)
+                throw BadConfiguration();
 
         BOOST_FOREACH(string i, tmp_vec) {
@@ -57 +64 @@
         istringstream i(tmp);
         i >> _last_reset;
+        if (!_last_reset)
+                throw BadConfiguration();
+                
 }
 

trunk/src/statistics.h

@@ -24 +24 @@
 #include "configuration.h"
 #include <vector> 
+#include <exception> 
 namespace statistics {
 
@@ -55 +56 @@
         void save();
 
+        /**
+         * Loads data from the backend.
+         */
+        void load_data();
+
         int _games_started;
         int _games_finished;
@@ -61 +67 @@
         std::vector<int> score_distribution;
         configuration::Configuration *backend;
+};
+
+class BadConfiguration : public std::exception {
+        virtual const char* what() const throw()
+        {
+                return "Bad Configuration";
+        }
 };