rocker 0.0.7 → 0.0.8

data/ext/rocker/rocker.h

@@ -64,6 +64,9 @@ public:
 
         updater(*action);
 
+        // Make sure to actually save the results.
+        action->commit();
+
         delete action;
     }
 
@@ -74,7 +77,7 @@ public:
 
     // Return the mean AUC calculated -- requires that process_results was called,
     // which happens in the constructor, so it's okay.
-    double mean_auc() { return mean_auc_; }
+    double mean_auc() { return updater.mean_auc; }
     
     // Go through the results directory
     map<uint,auc_info> process_results() {
@@ -99,9 +102,9 @@ public:
 
         // Calculate the mean AUC
         if (divide_by > 0)
-            mean_auc_ = temp_auc_accum / (double)(divide_by);
+            updater.mean_auc = temp_auc_accum / (double)(divide_by);
         else
-            mean_auc_ = 0;
+            updater.mean_auc = 0;
 
         return rocs;
     }

data/ext/rocker/updater.h

@@ -49,7 +49,8 @@ public:
 
     uint experiment_id;
     map<uint,auc_info> aucs;
-    string query;
+    double mean_auc;
+    string insert_query, update_query;
 
     void operator()(argument_type &T) {
         result R;
@@ -59,14 +60,21 @@ public:
             return;
         }
 
-        query = make_known_correct_query().c_str();
+        insert_query = make_insertion_sql().c_str();
+        update_query = make_update_total_auc_sql().c_str();
 
         try {
-            R = T.exec(query);
+            // Insert the AUCs
+            R = T.exec(insert_query);
             cout << "Query:" << endl;
-            cout << query << endl;
+            cout << insert_query << endl;
+
+            // Update the average AUC
+            R = T.exec(update_query);
+            cout << "Query:" << endl;
+            cout << update_query << endl;
         } catch (pqxx::sql_error e) {
-            cerr << "SQL error in Fetcher transactor." << endl;
+            cerr << "SQL error in Updater transactor." << endl;
             cerr << "Query: " << e.query() << endl;
             cerr << "Error: " << e.what()  << endl;
             //FIXME: Needs to throw a Rails exception of some kind. (Or does it?)
@@ -74,7 +82,7 @@ public:
     }
 
 protected:
-    string make_known_correct_query() const {
+    string make_insertion_sql() const {
         ostringstream q;
         q << "INSERT INTO rocs " << AUC_COLUMNS << " VALUES \n";
         list<string> insertions;
@@ -84,4 +92,11 @@ protected:
         q << join(insertions, ",\n") << ';';
         return q.str();
     }
+
+    string make_update_total_auc_sql() const {
+        ostringstream q;
+        q << "UPDATE experiments SET total_auc = " << mean_auc
+          << " WHERE experiments.id = " << experiment_id << ';';
+
+    }
 };

data/lib/rocker.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'rocker.so'
 
 class Rocker
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - John Woods
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 -05:00
+date: 2010-04-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency