nodes, weights, and smethign to tr to combine everything

j-faria · Oct 26, 2018 · 2529960 · 2529960
1 parent cf5f010
commit 2529960
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/Nodes.cpp b/src/Nodes.cpp
@@ -1,5 +1,7 @@
-#include "Nodes.h"
 #include "Data.h"
+#include "GPRN.h"
+#include "Nodes.h"
+
 #include <iostream>
 #include <fstream>
 #include <cmath>
@@ -9,19 +11,18 @@
 using namespace std;
 using namespace Eigen;
 
+Nodes Nodes::instance;
 Nodes::Nodes()
 {
 
 }
 
-
-const vector<double>& t = Data::get_instance().get_t();
-const vector<double>& sig = Data::get_instance().get_sig();
-int N = Data::get_instance().get_t().size();
+extern vector<double> t; //= Data::get_instance().get_t();
+extern vector<double> sig; //= Data::get_instance().get_sig();
+extern int N; //= Data::get_instance().get_t().size();
 
 //just to compile for now
-double extra_sigma;
-
+extern double extra_sigma;
 
 Eigen::MatrixXd Nodes::constant(std::vector<double> vec)
 // vec = [constant]

diff --git a/src/Nodes.h b/src/Nodes.h
@@ -2,6 +2,7 @@
 #define NODES_H
 
 #include "Data.h"
+#include "RVmodel.h"
 #include <Eigen/Core>
 #include <Eigen/Dense>
 
@@ -29,10 +30,14 @@ class Nodes
         //matern 5/2 kernel
         Eigen::MatrixXd matern52(std::vector<double> vec);
 
-
     private:
         Eigen::MatrixXd C {Data::get_instance().N(), Data::get_instance().N()};
-
+
+    //Singleton
+    public:
+        static Nodes& get_instance() {return instance ;}
+    private:
+        static Nodes instance;
 };
 
 #endif // NODES_H