From d2453e2de7d6afa5e97cf99d663dff67bf16eb20 Mon Sep 17 00:00:00 2001
From: Steven Holtzen <sholtzen@gmail.com>
Date: Thu, 28 Feb 2019 16:31:51 -0800
Subject: [PATCH] gibbs

---
 .#factor.py |  1 -
 factor.py   | 50 ++++++++++++++++++++++++++++++++------------------
 2 files changed, 32 insertions(+), 19 deletions(-)
 delete mode 120000 .#factor.py

diff --git a/.#factor.py b/.#factor.py
deleted file mode 120000
index ca6e13f..0000000
--- a/.#factor.py
+++ /dev/null
@@ -1 +0,0 @@
-sholtzen@wifi-131-179-3-172.host.ucla.edu.68311
\ No newline at end of file
diff --git a/factor.py b/factor.py
index 28ac13b..2ba02e7 100644
--- a/factor.py
+++ b/factor.py
@@ -143,10 +143,29 @@ def orbitjump(self, state, n):
             # divided by 0
             return (1.0, hatx)
 
+    ### perform a standard orbital MCMC gibbs update, a la Niepert 2012
+    ### state: a state
+    ### returns: the gibbs update state
+    def orbitgibbs(self, state):
+        v = sage.misc.prandom.choice(self.variables)
+        # resample the variable
+        v_true = state.copy()
+        v_true[v] = True
+        v_false = state.copy()
+        v_false[v] = False
+        prob = self.potential(v_true) / (self.potential(v_true) + self.potential(v_false))
+
+        new_v = numpy.random.binomial(1, prob)
+        state[v] = new_v
+        return state
+
+
+
     ### draw n samples according to orbit jump MCMC with no orbital MCMC
     ### burnsidesize: number of burnside steps to take
+    ### n: int, total number of samples to take
     ### query: state -> bool, evaluates a query on a state
-    ### gamma: how often to orbit-jump
+    ### gamma: int, after how many steps to perform an orbit jump
     ### burn: the burn in of the chain
     ### returns the probability of the query
     def orbitjumpmcmc(self, burnsidesize, n, query, burn):
@@ -158,28 +177,23 @@ def orbitjumpmcmc(self, burnsidesize, n, query, burn):
 
         query_count = 0.0
         cur_step = 0
-        counts = dict()
-        for v in self.variables:
-            counts[v] = 0
-        counts[len(self.variables)] = 0
 
         for i in range(0, n * burn):
-            (ratio, new_state) = self.orbitjump(cur_state, burnsidesize)
-            num_true = 0
-            for k,v in new_state.iteritems():
-                if v:
-                    num_true += 1
-            counts[num_true] = counts[num_true] + 1
-
-            # accept with transition probability
-            acceptprob = numpy.minimum(1, ratio)
-            if numpy.random.binomial(1, acceptprob):
-                cur_state = new_state
+            if False:
+                # do a jump update
+                (ratio, new_state) = self.orbitjump(cur_state, burnsidesize)
+                # accept with transition probability
+                acceptprob = numpy.minimum(1, ratio)
+                if numpy.random.binomial(1, acceptprob):
+                    cur_state = new_state
+            else:
+                # do a gibbs update
+                cur_state = self.orbitgibbs(cur_state)
+
             if cur_step % burn == 0:
                 if query(cur_state):
                     query_count += 1
             cur_step += 1
-        print("counts: %s " % counts)
         return query_count / n
 
 
@@ -218,7 +232,7 @@ def run_burnside():
 
 def main():
     # print some burnside samples
-    n = 100
+    n = 1000
     g = graphs.CompleteGraph(2)
     def potential(state):
         p = 0.0