--- trunk/gadget/optinfo.h	2015/07/30 12:36:46	14
+++ trunk/gadget/optinfo.h	2015/09/01 19:14:33	15
@@ -121,7 +121,7 @@
    * \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser
    */
   virtual void OptimiseLikelihood();
-#ifdef GADGET_OPENMP
+#ifdef SPECULATIVE
   /**
    * \brief This is the function that will calculate the likelihood score using the Hooke & Jeeves optimiser parallelized with the reproducible version implemented OpenMP
    */
@@ -145,7 +145,7 @@
    * \param param is the IntVector containing the order that the parameters should be searched in
    * \return the best function value found from the search
    */
-  double bestNearbyOMP(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
+  double bestNearbyRepro(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
   /**
      * \brief This function implemented the speculative version with OpenMP will calculate the best point that can be found close to the current point
      * \param delta is the DoubleVector of the steps to take when looking for the best point
@@ -154,7 +154,7 @@
      * \param param is the IntVector containing the order that the parameters should be searched in
      * \return the best function value found from the search
      */
-  double bestNearbyOMP2(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
+  double bestNearbySpec(DoubleVector& delta, DoubleVector& point, double prevbest, IntVector& param);
   /**
    * \brief This is the maximum number of iterations for the Hooke & Jeeves optimisation
    */
@@ -211,7 +211,7 @@
    * \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser
    */
   virtual void OptimiseLikelihood();
-#ifdef GADGET_OPENMP
+#ifdef SPECULATIVE
   /**
    * \brief This is the function that will calculate the likelihood score using the Simulated Annealing optimiser parallelized with the reproducible version implemented OpenMP
    */
@@ -315,7 +315,7 @@
    * \brief This is the function that will calculate the likelihood score using the BFGS optimiser
    */
   virtual void OptimiseLikelihood();
-#ifdef GADGET_OPENMP
+#ifdef SPECULATIVE
   /**
   * \brief This function call the sequential function. BFGS isn't implemented with OpenMP
   */