From 1ff004b8addbc5a8db66b169d76eb8ca5ca8c832 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Mon, 17 Mar 2014 14:58:18 +0000
Subject: [PATCH] FitInterface: various index fixes

---
 lib/FitInterface.cpp | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/FitInterface.cpp b/lib/FitInterface.cpp
index a12bf30..85e26a1 100644
--- a/lib/FitInterface.cpp
+++ b/lib/FitInterface.cpp
@@ -42,25 +42,36 @@ void FitInterface::assumeXExact(const Index i, const bool isExact)
 void  FitInterface::assumeXXCorrelated(const Index i1, const Index i2,
                                        const bool isCorrelated)
 {
-    isXXCorr_(i1, i2) = (isCorrelated) ? 1 : 0;
+    int val = (isCorrelated) ? 1 : 0;
+    
+    isXXCorr_(i1, i2) = val;
+    isXXCorr_(i2, i1) = val;
 }
 
 void  FitInterface::assumeYYCorrelated(const Index j1, const Index j2,
                                        const bool isCorrelated)
 {
-    isYYCorr_(j1, j2) = (isCorrelated) ? 1 : 0;
+    int val = (isCorrelated) ? 1 : 0;
+    
+    isYYCorr_(j1, j2) = val;
+    isYYCorr_(j2, j1) = val;
 }
 
 void  FitInterface::assumeYXCorrelated(const Index j, const Index i,
                                        const bool isCorrelated)
 {
-    isYXCorr_(j, i) = (isCorrelated) ? 1 : 0;
+    int val = (isCorrelated) ? 1 : 0;
+    
+    isYXCorr_(j, i) = val;
 }
 
 void  FitInterface::assumeDataCorrelated(const Index k1, const Index k2,
                                          const bool isCorrelated)
 {
-    isDataCorr_(k1, k2) = (isCorrelated) ? 1 : 0;
+    int val = (isCorrelated) ? 1 : 0;
+    
+    isDataCorr_(k1, k2) = val;
+    isDataCorr_(k2, k1) = val;
 }
 
 void FitInterface::fitPoint(const Index i, const bool isFitPoint)
@@ -141,7 +152,7 @@ void FitInterface::resize(const Index nData, const Index xDim, const Index yDim)
     isXExact_.setConstant(xDim, 0);
     isFitPoint_.setConstant(nData, 0);
     isXXCorr_.setIdentity(xDim, xDim);
-    isYYCorr_.setIdentity(xDim, xDim);
+    isYYCorr_.setIdentity(yDim, yDim);
     isYXCorr_.setConstant(yDim, xDim, 0);
     isDataCorr_.setIdentity(nData, nData);
 }