Named constants

include/ElectromotorModelSimulator.hpp

@@ -43,6 +43,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <utility>
 #include <vector>
 
+// Define parameters for GA evaluation function
+#define PATTERN_NORMALIZATION_X_VALUE 1000
+#define PATTERN_INTERPOLATION_STEP 20
+
 class ElectromotorModelSimulator {
  private:
   std::unique_ptr<ElectromotorModel> _model;
@@ -116,7 +120,8 @@ class ElectromotorModelSimulator {
     float ret = 0.0, minRet = INT_MAX;
 
     for (unsigned int patI = 0; patI < patternIPIs[pattern].size(); ++patI) {
-      int newMaxX = 1000, interpStep = 20;
+      int newMaxX = PATTERN_NORMALIZATION_X_VALUE,
+          interpStep = PATTERN_INTERPOLATION_STEP;
 
       std::vector<int> normIPIs = _normalize(_IPIs[pattern], newMaxX);
       std::vector<int> normPatIPIs =

include/ElectromotorModelStd.hpp

@@ -45,6 +45,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "ModelOutput.hpp"
 
+// Random initialization time range
+#define MIN_TIME_RANDOM_INIT 300
+#define MAX_TIME_RANDOM_INIT 500
+
 template <typename ProblemConfigType>
 class ElectromotorModelStd {
  public:
@@ -74,7 +78,8 @@ class ElectromotorModelStd {
   std::unique_ptr<ModelOutput> _out;
 
   std::default_random_engine _getRand;
-  std::uniform_int_distribution<int> _timeRange{30, 60};
+  std::uniform_int_distribution<int> _timeRange{MIN_TIME_RANDOM_INIT,
+                                                MAX_TIME_RANDOM_INIT};
 
   struct iExtNeurons {
     double VPd;