Forráskód Böngészése

adapted everything to new structure in core-optimization

Alexander Freytag 12 éve
szülő
commit
61f533dfd7

+ 1 - 1
classifier/kernelclassifier/GPLaplaceOptimizationProblem.h

@@ -9,7 +9,7 @@
 
 #include "core/vector/VVector.h"
 #include "vislearning/math/kernels/ParameterizedKernel.h"
-#include "core/optimization/limun/OptimizationProblemFirst.h"
+#include "core/optimization/gradientBased/OptimizationProblemFirst.h"
 
 #include "vislearning/math/kernels/KernelData.h"
 

+ 2 - 2
classifier/kernelclassifier/KCGPLaplace.cpp

@@ -15,8 +15,8 @@
 #include "LHCumulativeGauss.h"
 
 #include "vislearning/classifier/kernelclassifier/GPLaplaceOptimizationProblem.h"
-#include "core/optimization/limun/FirstOrderTrustRegion.h"
-#include "core/optimization/limun/FirstOrderRasmussen.h"
+#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
+#include "core/optimization/gradientBased/FirstOrderRasmussen.h"
 
 using namespace std;
 using namespace NICE;

+ 3 - 3
classifier/kernelclassifier/KCGPLaplaceOneVsAll.cpp

@@ -10,9 +10,9 @@
 
 #include "core/vector/Algorithms.h"
 
-#include "core/optimization/limun/OptimizationAlgorithmFirst.h"
-#include "core/optimization/limun/FirstOrderTrustRegion.h"
-#include "core/optimization/limun/FirstOrderRasmussen.h"
+#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h"
+#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
+#include "core/optimization/gradientBased/FirstOrderRasmussen.h"
 
 #include "vislearning/classifier/kernelclassifier/GPLaplaceOptimizationProblem.h"
 #include "core/algebra/CholeskyRobust.h"

+ 3 - 3
classifier/kernelclassifier/KCGPRegOneVsAll.cpp

@@ -14,9 +14,9 @@
 
 #include "core/vector/Algorithms.h"
 
-#include "core/optimization/limun/OptimizationAlgorithmFirst.h"
-#include "core/optimization/limun/FirstOrderTrustRegion.h"
-#include "core/optimization/limun/FirstOrderRasmussen.h"
+#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h"
+#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
+#include "core/optimization/gradientBased/FirstOrderRasmussen.h"
 
 #include "vislearning/regression/gpregression/GPRegressionOptimizationProblem.h"
 #include "core/algebra/CholeskyRobust.h"

+ 1 - 1
regression/gpregression/GPRegressionOptimizationProblem.h

@@ -9,7 +9,7 @@
 
 #include "core/vector/VVector.h"
 #include "vislearning/math/kernels/ParameterizedKernel.h"
-#include "core/optimization/limun/OptimizationProblemFirst.h"
+#include "core/optimization/gradientBased/OptimizationProblemFirst.h"
 
 #include "vislearning/math/kernels/KernelData.h"
 

+ 3 - 3
regression/gpregression/RegGaussianProcess.cpp

@@ -8,9 +8,9 @@
 #include <iostream>
 #include <sstream>
 
-#include "core/optimization/limun/OptimizationAlgorithmFirst.h"
-#include "core/optimization/limun/FirstOrderTrustRegion.h"
-#include "core/optimization/limun/FirstOrderRasmussen.h"
+#include "core/optimization/gradientBased/OptimizationAlgorithmFirst.h"
+#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
+#include "core/optimization/gradientBased/FirstOrderRasmussen.h"
 
 #include "core/vector/Algorithms.h"
 #include "core/algebra/CholeskyRobust.h"

+ 1 - 1
regression/gpregression/modelselcrit/GPMSCLooEstimates.cpp

@@ -11,7 +11,7 @@
 #include "vislearning/cbaselib/ClassificationResults.h"
 #include "vislearning/classifier/kernelclassifier/LikelihoodFunction.h"
 #include "core/algebra/CholeskyRobustAuto.h"
-#include "core/optimization/limun/FirstOrderTrustRegion.h"
+#include "core/optimization/gradientBased/FirstOrderTrustRegion.h"
 
 #include "core/vector/Algorithms.h"
 

+ 1 - 1
regression/gpregression/modelselcrit/GPMSCLooEstimates.h

@@ -11,7 +11,7 @@
 #include "vislearning/math/kernels/KernelData.h"
 #include "vislearning/regression/gpregression/modelselcrit/GPModelSelectionCriterion.h"
 
-#include "core/optimization/limun/OptimizationProblemFirst.h"
+#include "core/optimization/gradientBased/OptimizationProblemFirst.h"
 
 namespace OBJREC {