From 46c1d0c512f9bffdf8339029e5bf2137fa11d943 Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Wed, 31 Oct 2012 22:27:36 +0000
Subject: [PATCH] Added joint marginal timing to timeIncremental script

---
 tests/timeIncremental.cpp | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/tests/timeIncremental.cpp b/tests/timeIncremental.cpp
index 433d3cd0a..64fd02863 100644
--- a/tests/timeIncremental.cpp
+++ b/tests/timeIncremental.cpp
@@ -197,18 +197,38 @@ int main(int argc, char *argv[]) {
   try {
     Marginals marginals(graph, values);
     int i=0;
+    BOOST_REVERSE_FOREACH(Key key1, values.keys()) {
+      int j=0;
+      BOOST_REVERSE_FOREACH(Key key2, values.keys()) {
+        if(i != j) {
+          gttic_(jointMarginalInformation);
+          std::vector<Key> keys(2);
+          keys[0] = key1;
+          keys[1] = key2;
+          JointMarginal info = marginals.jointMarginalInformation(keys);
+          gttoc_(jointMarginalInformation);
+          tictoc_finishedIteration_();
+        }
+        ++j;
+        if(j >= 50)
+          break;
+      }
+      ++i;
+      if(i >= 50)
+        break;
+    }
+    tictoc_print_();
     BOOST_FOREACH(Key key, values.keys()) {
       gttic_(marginalInformation);
       Matrix info = marginals.marginalInformation(key);
       gttoc_(marginalInformation);
       tictoc_finishedIteration_();
-      if(i % 1000 == 0)
-        tictoc_print_();
       ++i;
     }
   } catch(std::exception& e) {
     cout << e.what() << endl;
   }
+  tictoc_print_();
 
   return 0;
 }