From 41ea5c984edc077a110acb77e89e9165eda9ec80 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 5 Apr 2016 12:50:02 +0100
Subject: [PATCH] FitInterface: methods to set global correlations

---
 lib/FitInterface.cpp | 33 +++++++++++++++++++++++++++++++++
 lib/FitInterface.hpp |  3 +++
 2 files changed, 36 insertions(+)

diff --git a/lib/FitInterface.cpp b/lib/FitInterface.cpp
index 3569469..e3bac5e 100644
--- a/lib/FitInterface.cpp
+++ b/lib/FitInterface.cpp
@@ -285,6 +285,16 @@ void FitInterface::assumeXXCorrelated(const bool isCorr, const Index r1,
     scheduleFitVarMatInit();
 }
 
+void FitInterface::assumeXXCorrelated(const bool isCorr, const Index i1,
+                                      const Index i2)
+{
+    for (Index r1 = 0; r1 < getXSize(i1); ++r1)
+    for (Index r2 = 0; r2 < getXSize(i2); ++r2)
+    {
+        assumeXXCorrelated(isCorr, r1, i1, r2, i2);
+    }
+}
+
 void FitInterface::assumeYYCorrelated(const bool isCorr, const Index k1,
                                       const Index j1, const Index k2,
                                       const Index j2)
@@ -300,6 +310,18 @@ void FitInterface::assumeYYCorrelated(const bool isCorr, const Index k1,
     scheduleFitVarMatInit();
 }
 
+void FitInterface::assumeYYCorrelated(const bool isCorr, const Index j1,
+                                      const Index j2)
+{
+    checkYDim(j1);
+    checkYDim(j2);
+    for (auto &p1: yDataIndex_[j1])
+    for (auto &p2: yDataIndex_[j2])
+    {
+        assumeYYCorrelated(isCorr, p1.first, j1, p2.first, j2);
+    }
+}
+
 void FitInterface::assumeXYCorrelated(const bool isCorr, const Index r,
                                       const Index i, const Index k,
                                       const Index j)
@@ -312,6 +334,17 @@ void FitInterface::assumeXYCorrelated(const bool isCorr, const Index r,
     scheduleFitVarMatInit();
 }
 
+void FitInterface::assumeXYCorrelated(const bool isCorr, const Index i,
+                                      const Index j)
+{
+    checkYDim(j);
+    for (Index r = 0; r < getXSize(i); ++r)
+    for (auto &p: yDataIndex_[j])
+    {
+        assumeXYCorrelated(isCorr, r, i, p.first, j);
+    }
+}
+
 // tests ///////////////////////////////////////////////////////////////////////
 bool FitInterface::pointExists(const Index k) const
 {
diff --git a/lib/FitInterface.hpp b/lib/FitInterface.hpp
index 00fb547..8a4bec0 100644
--- a/lib/FitInterface.hpp
+++ b/lib/FitInterface.hpp
@@ -92,10 +92,13 @@ public:
     void assumeXExact(const bool isExact, const Index i);
     void assumeXXCorrelated(const bool isCorr, const Index r1, const Index i1,
                             const Index r2, const Index i2);
+    void assumeXXCorrelated(const bool isCorr, const Index i1, const Index i2);
     void assumeYYCorrelated(const bool isCorr, const Index k1, const Index j1,
                             const Index k2, const Index j2);
+    void assumeYYCorrelated(const bool isCorr, const Index j1, const Index j2);
     void assumeXYCorrelated(const bool isCorr, const Index r, const Index i,
                             const Index k, const Index j);
+    void assumeXYCorrelated(const bool isCorr, const Index i, const Index j);
     // tests
     bool pointExists(const Index k) const;
     bool pointExists(const Index k, const Index j) const;