New get/set functions. Minor changes.

include/Parameters.hpp

@@ -26,6 +26,16 @@ public:
     std::vector<double> GetMaterialList(); //Get the whole vector
     double GetListSize();
     
+    double GetEnergy();
+    void SetEnergy(double);
+    
+    double GetShape();
+    void SetShape(double);
+    
+    std::vector<double> GetDimension();
+    
+    std::vector<double> GetVoxel();
+    
     ~Parameters();
 private:
     Parameters();
@@ -36,15 +46,18 @@ private:
     double energy;
     double shape;
     
-    //Shape dimension
+    /*
-    double length_x;
+     * Shape dimension
-    double length_y;
+     * X, Y, Z
-    double length_z;
+     */
+    std::vector<double> dimension;
     
-    //Voxel
+    /*
-    double n_x;
+     * Voxel
-    double n_y;
+     * X, Y, Z
-    double n_z;
+     */
+    std::vector<double> n;
+    double n_sum = 1;
     
     std::vector<double> material;
 };

main.cpp

@@ -11,8 +11,31 @@
 
 int main(int argc, const char * argv[])
 {
+    //Initialize class
     Parameters *param = Parameters::GetInstance();
     
+    //Get energy and shape
+    std::cout << param -> GetEnergy() << " " << param -> GetShape() << std::endl;
+    
+    //Get dimension
+    std::vector<double> dimension = param -> GetDimension();
+    
+    for(int i = 0; i < dimension.size(); i++)
+    {
+        std::cout << dimension[i] << " ";
+    }
+    std::cout << std::endl;
+    
+    //Get N
+    std::vector<double> voxel = param -> GetVoxel();
+    
+    for(int i = 0; i < voxel.size(); i++)
+    {
+        std::cout << voxel[i] << " ";
+    }
+    std::cout << std::endl;
+    
+    //Get materials
     for(int i = 0; i < param -> GetListSize(); i++)
     {
         std::cout << param -> GetMaterial(i) << std::endl;

src/Parameters.cpp

@@ -32,12 +32,25 @@ Parameters::Parameters()
         
         int index_helper = 0;
         double material_helper = 0;
+        double helper = 0;
         
         //Read the data
         file >> energy >> shape;
-        file >> length_x >> length_y >> length_z;
+        
-        file >> n_x >> n_y >> n_z;
+        for(int i = 0; i < 3; i++)
-        for(int i = 0; i < (n_x * n_y * n_z); i++)
+        {
+            file >> helper;
+            dimension.push_back(helper);
+        }
+        
+        for (int i = 0; i < 3; i++)
+        {
+            file >> helper;
+            n_sum = n_sum * helper;
+            n.push_back(helper);
+        }
+        
+        for(int i = 0; i < n_sum; i++)
         {
             file >> index_helper;
             if(index_helper == i)
@@ -90,3 +103,33 @@ double Parameters::GetListSize()
 {
     return material.size();
 }
+
+double Parameters::GetEnergy()
+{
+    return energy;
+}
+
+void Parameters::SetEnergy(double e)
+{
+    energy = e;
+}
+
+double Parameters::GetShape()
+{
+    return shape;
+}
+
+void Parameters::SetShape(double s)
+{
+    shape = s;
+}
+
+std::vector<double> Parameters::GetDimension()
+{
+    return dimension;
+}
+
+std::vector<double> Parameters::GetVoxel()
+{
+    return n;
+}