Commits

Ruben Martinez-Cantin committed c262fc4

Renaming stuff

  • Participants
  • Parent commits 754e5b2

Comments (0)

Files changed (7)

File CMakeLists.txt

   ./src/inneroptimization.cpp
   ./src/nonparametricprocess.cpp
   ./src/kernelregressor.cpp
-  ./src/empiricalbayesprocess.cpp
+  ./src/conditionalbayesprocess.cpp
   ./src/hierarchical_gaussian_process.cpp
   ./src/gaussian_process.cpp
   ./src/gaussian_process_ml.cpp

File include/empiricalbayesprocess.hpp

-/** \file empiricalbayesprocess.hpp
+/** \file conditionalbayesprocess.hpp
     \brief Implementes a empirical Bayesian nonparametric process with a 
     ML, MAP or similar estimate of kernel parameters. */
 /*
   /**
    * \brief Empirical Bayesian NonParametric process.
    */
-  class ConditionalBayesProcess: public KernelRegressor, RBOptimizable
+  class EmpiricalBayesProcess: public RBOptimizable
   {
   public:
-    ConditionalBayesProcess(size_t dim, bopt_params parameters,
+    EmpiricalBayesProcess(size_t dim, bopt_params parameters,
 			  const Dataset& data, randEngine& eng);
-    virtual ~ConditionalBayesProcess();
+    virtual ~EmpiricalBayesProcess();
 
     /** 
      * \brief Function that returns the prediction of the GP for a query point

File include/gaussian_process.hpp

 #define  _GAUSSIAN_PROCESS_HPP_
 
 #include "gauss_distribution.hpp"
-#include "empiricalbayesprocess.hpp"
+#include "conditionalbayesprocess.hpp"
 
 
 namespace bayesopt

File include/hierarchical_gaussian_process.hpp

 #ifndef __HIERARCHICAL_GAUSSIAN_PROCESS_HPP__
 #define __HIERARCHICAL_GAUSSIAN_PROCESS_HPP__
 
-#include "empiricalbayesprocess.hpp"
+#include "conditionalbayesprocess.hpp"
 
 
 namespace bayesopt

File include/mcmc.hpp

     for(size_t i=0; i<nBurnOut; ++i)  sliceSample(x);
   }
 
-  inline void MCMC::sampleParticles(const vectord &initX, bool burnout)
-  {
-    vectord x = initX;
-    if (burnout) burnOut(x);
-
-    mParticles.clear();
-    for(size_t i=0; i<nSamples; ++i)  
-      {
-	sliceSample(x);
-	mParticles.push_back(x);
-      }
-    
-  }
-
-
 } //namespace bayesopt
 
 

File include/optimizekernel.hpp

 #define __OPTIMIZEKERNEL_HPP__
 
 #include "inneroptimization.hpp"
-#include "empiricalbayesprocess.hpp"
+#include "conditionalbayesprocess.hpp"
 
 namespace bayesopt {
 

File src/mcmc.cpp

 }
 
 
+void MCMC::sampleParticles(const vectord &initX, bool burnout)
+{
+  vectord x = initX;
+  if (burnout) burnOut(x);
+  
+  mParticles.clear();
+  for(size_t i=0; i<nSamples; ++i)  
+    {
+      sliceSample(x);
+      mParticles.push_back(x);
+    }
+}