From 598e7fc8e98f218993bf07a7b6cc39539d8f7690 Mon Sep 17 00:00:00 2001
From: Mauro Iazzi <mauro.iazzi@gmail.com>
Date: Fri, 31 Jul 2009 13:00:57 +0200
Subject: [PATCH] last bunch of changes before jump to new version

---
 Makefile            |  2 +-
 analyze.cpp         |  0
 compute_weights.cpp | 20 ++++++++++++++------
 main.cpp            |  9 +++++----
 4 files changed, 20 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 analyze.cpp
 mode change 100644 => 100755 compute_weights.cpp
 mode change 100644 => 100755 main.cpp

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 8075fff..87cd421
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ main: .main.dep main.o
 
 clean:
 	make -C $(LUA) clean
-	rm -f main main.o
+	rm -f main main.o analyze.o compute_weights.o
 
 .PHONY: clean default all
 
diff --git a/analyze.cpp b/analyze.cpp
old mode 100644
new mode 100755
diff --git a/compute_weights.cpp b/compute_weights.cpp
old mode 100644
new mode 100755
index db93ee9..0c35a8a
--- a/compute_weights.cpp
+++ b/compute_weights.cpp
@@ -33,7 +33,7 @@
 
 using namespace std;
 
-void analyze_data_file (std::string filename, std::ostream& out, const int len, double c) {
+void analyze_data_file (std::string filename, std::ostream& out, const int len, double c, bool use_log = true) {
     int n = 0;
     double *v = new double[len];
     int i = 0;
@@ -49,16 +49,23 @@ void analyze_data_file (std::string filename, std::ostream& out, const int len,
         if (line_string[0]=='#') {
             out << line_string << "\n";
         } else if (line_string.size()!=0) {
-            double nw = 0.0;
+            double nw = use_log?0.0:1.0;
             line >> state >> energy >> weight;
-            weight = std::log(weight);
+            if (use_log) {
+                weight = std::log(weight) - c;
+            } else {
+                weight = weight * std::exp(-c);
+            }
             out << state << " " << energy;
-            weight -= c;
             v[i] = weight;
             for (int j=0;j<len;j++) {
-                nw += v[(len+i-j)%len];
+                if (use_log) {
+                    nw += v[(len+i-j)%len];
+                } else {
+                    nw *= v[(len+i-j)%len];
+                }
             }
-            out << " " << std::exp(nw);
+            out << " " << (use_log?std::exp(nw):nw);
             out << "\n";
             i = (i+1) % len;
         }
@@ -92,6 +99,7 @@ int main (int argc, char **argv) {
         ofn.append("-l-");
         ofn.append(len_s);
         fstream o(ofn.c_str(), fstream::out);
+        o.precision(10);
         o << "#!prepend " << len_s << "\n";
         analyze_data_file(*iter, o, len, corr);
         o.close();
diff --git a/main.cpp b/main.cpp
old mode 100644
new mode 100755
index f2828d0..b2715c0
--- a/main.cpp
+++ b/main.cpp
@@ -457,7 +457,7 @@ class Walker {
             const int L = m_state.size();
             double e_L = 0.0;
             double self = 0.0;
-            int j = 1; // 0 is reserved for no change
+            int j = 0;
             _G.resize(L+1, -1.0); // L spins can flip or no flip at all
             _x.resize(L+1, -1); // L spins can flip or no flip at all
             for (int i=0;i<L;i++) {
@@ -472,13 +472,13 @@ class Walker {
                     self -= J*D; // the energy of the state
                 }
             }
+            self = 0.25*self; // spin-1/2
+            _G[j] = Lambda-self;
+            _x[j++] = -1;
             for (;j<=L;j++) { // overwrite possible leftover values
                 _G[j] = -1.0;
                 _x[j] = -1;
             }
-            self = 0.25*self; // spin-1/2
-            _G[0] = Lambda-self;
-            _x[0] = -1;
             e_L = self+e_L; // e_L is now correct
             m_localEnergy = e_L;
             //std::cout << e_L-m_energy.compute(m_state, m_helper, m_prob) << std::endl;
@@ -600,6 +600,7 @@ int main (int argc, char **argv) {
     double e = 0.0;
     double w = 0.0;
     if (out.is_open()) {
+        out.precision(10);
         out << "#!prepend " << alpha << "\n";
         out << "# alpha = " << alpha << "\n";
         out << "# format = '^([01]+)%s+(.*)$'\n";
-- 
2.11.4.GIT