Simplified DiscreteBasis class

src/Basis/Base.h

@@ -11,10 +11,10 @@ enum base_type { discrete, continuous };
 
 class Base {
 protected:
+
     // About coords: maybe should not exist in this manner. It's better to evaluate at run-time.
     // Instead of a vector of coords it's better to have a vector of Dimensions, where Dimensions are structs
     // with parameters related to basis type.
-    std::vector< std::vector<double> > coords;
 
 public:
     Potential *potential;

src/Basis/ContinuousBase.cpp

@@ -26,8 +26,8 @@ ContinuousBase::ContinuousBase(double starting, double end, std::vector<double>
 
     // Due to the fact that Basis->coords is vector<double>
     // here's the conversion from vector<int> to vector<double>
-    this->coords.reserve(nbox);
-    for(std::vector<double>::size_type i = 0; i < coords.size(); i++)
-        this->coords[i][0] = starting + mesh[0] * i;
+    this->coord.reserve(nbox);
+    for(std::vector<double>::size_type i = 0; i < coord.size(); i++)
+        this->coord[i] = starting + mesh[0] * i;
 
 }

src/Basis/ContinuousBase.h

@@ -7,6 +7,8 @@ class ContinuousBase : public Base {
 public:
     ContinuousBase(double, double, std::vector<double>, unsigned int);
 
+    std::vector<double> coord;
+
 //    void combine() {} // @TODO implement
 //    void change(base_type t) {} // @TODO implement
 //    void set_potential() {} // @TODO implement

src/Basis/DiscreteBase.cpp

@@ -1,15 +1,20 @@
 #include "DiscreteBase.h"
 
-DiscreteBase::DiscreteBase(std::vector< std::vector<int> > dimensions, Potential potential)
+DiscreteBase::DiscreteBase(int start, int end, int step)
 {
-    if (dimensions.size() == 0)
-        throw std::invalid_argument("Empty dimensions vector given.");
-
-    // Due to the fact that Basis->coords is vector<double>
-    // here's the conversion from vector<int> to vector<double>
-    this->coords.reserve(dimensions.size());
-    for(auto&& dimension : dimensions) {
-        this->coords.emplace_back(dimension.begin(), dimension.end());
+    //if not integer division of the basis
+    if((start-end)/step % 1 !=0)
+        throw std::invalid_argument("invalid discrete basis given (check interval and step).");
+
+    unsigned int base_value = (start-end)/step;
+    if (base_value == 0)
+        throw std::invalid_argument("Empty dimensions basis given.");
+
+    this->quantum_numbers.reserve(base_value);
+
+    int j=0;
+    for(int i = start; i < end; i++ ) {
+        this->quantum_numbers[j] = i;
+        j++;
     }
-    this->potential = &potential;
 }

src/Basis/DiscreteBase.h

@@ -4,20 +4,20 @@
 #include "Base.h"
 
 class DiscreteBase : public Base {
-public:
-    DiscreteBase(std::vector< std::vector<int> > dimensions, Potential potential);
+private:
+    DiscreteBase(int, int, int);
+    std::vector<int> quantum_numbers;
+
 
     void combine() {} // @TODO implement
     void change(base_type t) {} // @TODO implement
     void set_potential() {} // @TODO implement
 
     class Builder {
-    private:
-        std::vector< std::vector<int> > dimensions;
-        Potential potential;
+//    private:
+//        std::vector<int> quantum_numbers;
     public:
-        Builder addDimension(int min_value, int max_value, int step);
-        Builder addPotential(Potential p);
+        Builder addQuantumNumbers(int min_value, int max_value, int step);
         DiscreteBase build();
     };
 };