Remove dead function print_navbar().

[wloh] / bayeswf.cpp

diff --git a/bayeswf.cpp b/bayeswf.cpp
index 205aaaba5c248391c99fdd709afb1b7ac092faea..eee6882e4e18f59dcc9c2b8f37f950e22b3d6e13 100644 (file)
--- a/bayeswf.cpp
+++ b/bayeswf.cpp
@@ -264,9 +264,9 @@ void compute_mu_uncertainty(const float *mu, const vector<int> &players)
 #else
        for (unsigned i = 0; i < players.size(); ++i) {
                for (unsigned j = 0; j < players.size(); ++j) {
-                       printf("covariance %s %s %f\n",
-                              players[i].c_str(),
-                              players[j].c_str(),
+                       printf("covariance %d %d %f\n",
+                              players[i],
+                              players[j],
                               ih(i, j));
                }
        }
@@ -406,7 +406,7 @@ void process_file(const char *filename)
 int main(int argc, char **argv)
 {
 #if USE_DB
-       pqxx::connection conn("dbname=wloh_dev host=127.0.0.1 user=wloh password=oto4iCh5");
+       pqxx::connection conn("dbname=wloh host=127.0.0.1 user=wloh password=oto4iCh5");
 #endif
        
        for (int i = 1; i < argc; ++i) {
@@ -422,6 +422,23 @@ int main(int argc, char **argv)
        pqxx::work txn(conn);
        txn.exec("SET client_min_messages TO WARNING");
 
+       // Dump aux_params.
+       {
+               txn.exec("TRUNCATE aux_params");
+               pqxx::tablewriter writer(txn, "aux_params");
+               for (map<pair<string, string>, float>::const_iterator it = aux_params.begin(); it != aux_params.end(); ++it) {
+                       char str[128];
+                       snprintf(str, 128, "%f", it->second);
+
+                       vector<string> tuple;
+                       tuple.push_back(it->first.first);  // locale
+                       tuple.push_back(it->first.second);  // parameter name
+                       tuple.push_back(str);
+                       writer.push_back(tuple);
+               }
+               writer.complete();
+       }
+
        // Dump ratings.        
        {
                txn.exec("TRUNCATE ratings");
@@ -464,27 +481,12 @@ int main(int argc, char **argv)
        txn.exec("ALTER TABLE new_covariance ADD PRIMARY KEY ( player1, player2 );");
        txn.exec("DROP TABLE IF EXISTS covariance");
        txn.exec("ALTER TABLE new_covariance RENAME TO covariance");
-
-       // Dump aux_params.
-       {
-               txn.exec("TRUNCATE aux_params");
-               pqxx::tablewriter writer(txn, "aux_params");
-               for (map<pair<string, string>, float>::const_iterator it = aux_params.begin(); it != aux_params.end(); ++it) {
-                       char str[128];
-                       snprintf(str, 128, "%f", it->second);
-
-                       vector<string> tuple;
-                       tuple.push_back(it->first.first);  // locale
-                       tuple.push_back(it->first.second);  // parameter name
-                       tuple.push_back(str);
-                       writer.push_back(tuple);
-               }
-               writer.complete();
-       }
 #else
        //fprintf(stderr, "Optimal sigma: %f (two-player: %f)\n", sigma[0], sigma[0] * sqrt(2.0f));
        for (map<pair<string, string>, float>::const_iterator it = aux_params.begin(); it != aux_params.end(); ++it) {
-               printf("%s: aux_param %s %f\n", it->first->first, it->first->second, it->second);
+               printf("%s: aux_param %s %f\n", it->first.first.c_str(), it->first.second.c_str(), it->second);
        }
 #endif
+
+       txn.commit();
 }