From f8460a7ea50b4ced852278442f40109f8c4183d7 Mon Sep 17 00:00:00 2001 From: LPTK Date: Tue, 16 Jul 2013 15:32:07 +0200 Subject: [PATCH] renaming files with right name: moMetropolisHasting*s*, moSA*E*xplorer --- .../algo/{moMetropolisHasting.h => moMetropolisHastings.h} | 0 ...olisHastingExplorer.h => moMetropolisHastingsExplorer.h} | 0 mo/src/explorer/{moSAexplorer.h => moSAExplorer.h} | 0 mo/src/sampling/moMHBestFitnessCloudSampling.h | 4 ++-- mo/src/sampling/moMHRndFitnessCloudSampling.h | 4 ++-- mo/src/{continuator => sampling}/moStdDevEstimator.h | 0 mo/test/CMakeLists.txt | 6 +++--- ...t-moMetropolisHasting.cpp => t-moMetropolisHastings.cpp} | 0 ...stingExplorer.cpp => t-moMetropolisHastingsExplorer.cpp} | 0 mo/test/{t-moSAexplorer.cpp => t-moSAExplorer.cpp} | 0 10 files changed, 7 insertions(+), 7 deletions(-) rename mo/src/algo/{moMetropolisHasting.h => moMetropolisHastings.h} (100%) rename mo/src/explorer/{moMetropolisHastingExplorer.h => moMetropolisHastingsExplorer.h} (100%) rename mo/src/explorer/{moSAexplorer.h => moSAExplorer.h} (100%) rename mo/src/{continuator => sampling}/moStdDevEstimator.h (100%) rename mo/test/{t-moMetropolisHasting.cpp => t-moMetropolisHastings.cpp} (100%) rename mo/test/{t-moMetropolisHastingExplorer.cpp => t-moMetropolisHastingsExplorer.cpp} (100%) rename mo/test/{t-moSAexplorer.cpp => t-moSAExplorer.cpp} (100%) diff --git a/mo/src/algo/moMetropolisHasting.h b/mo/src/algo/moMetropolisHastings.h similarity index 100% rename from mo/src/algo/moMetropolisHasting.h rename to mo/src/algo/moMetropolisHastings.h diff --git a/mo/src/explorer/moMetropolisHastingExplorer.h b/mo/src/explorer/moMetropolisHastingsExplorer.h similarity index 100% rename from mo/src/explorer/moMetropolisHastingExplorer.h rename to mo/src/explorer/moMetropolisHastingsExplorer.h diff --git a/mo/src/explorer/moSAexplorer.h b/mo/src/explorer/moSAExplorer.h similarity index 100% rename from mo/src/explorer/moSAexplorer.h rename to mo/src/explorer/moSAExplorer.h diff --git a/mo/src/sampling/moMHBestFitnessCloudSampling.h b/mo/src/sampling/moMHBestFitnessCloudSampling.h index ebba8a3b9..e9c71f35b 100644 --- a/mo/src/sampling/moMHBestFitnessCloudSampling.h +++ b/mo/src/sampling/moMHBestFitnessCloudSampling.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -87,7 +87,7 @@ public: delete localSearch; // Metropolis-Hasting sampling - localSearch = new moMetropolisHasting(_neighborhood, _fullEval, _eval, _nbStep); + localSearch = new moMetropolisHastings(_neighborhood, _fullEval, _eval, _nbStep); // delete the checkpoint with the wrong continuator delete checkpoint; diff --git a/mo/src/sampling/moMHRndFitnessCloudSampling.h b/mo/src/sampling/moMHRndFitnessCloudSampling.h index 292d42344..2a3cca639 100644 --- a/mo/src/sampling/moMHRndFitnessCloudSampling.h +++ b/mo/src/sampling/moMHRndFitnessCloudSampling.h @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -87,7 +87,7 @@ public: delete localSearch; // Metropolis-Hasting sampling - localSearch = new moMetropolisHasting(_neighborhood, _fullEval, _eval, _nbStep); + localSearch = new moMetropolisHastings(_neighborhood, _fullEval, _eval, _nbStep); // delete the checkpoint with the wrong continuator delete checkpoint; diff --git a/mo/src/continuator/moStdDevEstimator.h b/mo/src/sampling/moStdDevEstimator.h similarity index 100% rename from mo/src/continuator/moStdDevEstimator.h rename to mo/src/sampling/moStdDevEstimator.h diff --git a/mo/test/CMakeLists.txt b/mo/test/CMakeLists.txt index 319ffb0c9..898e6e22d 100644 --- a/mo/test/CMakeLists.txt +++ b/mo/test/CMakeLists.txt @@ -38,7 +38,7 @@ set (TEST_LIST t-moNeutralHCexplorer t-moFirstImprHCexplorer t-moRandomWalkExplorer - t-moMetropolisHastingExplorer + t-moMetropolisHastingsExplorer t-moRandomNeutralWalkExplorer t-moTSexplorer t-moSolComparator @@ -52,7 +52,7 @@ set (TEST_LIST t-moMonOpPerturb t-moRestartPerturb t-moNeighborhoodPerturb - t-moSAexplorer + t-moSAExplorer t-moSA t-moLocalSearch t-moILSexplorer @@ -65,7 +65,7 @@ set (TEST_LIST t-moILS t-moDummyLS t-moRandomSearch - t-moMetropolisHasting + t-moMetropolisHastings t-moNeutralHC t-moRandomWalk t-moRandomNeutralWalk diff --git a/mo/test/t-moMetropolisHasting.cpp b/mo/test/t-moMetropolisHastings.cpp similarity index 100% rename from mo/test/t-moMetropolisHasting.cpp rename to mo/test/t-moMetropolisHastings.cpp diff --git a/mo/test/t-moMetropolisHastingExplorer.cpp b/mo/test/t-moMetropolisHastingsExplorer.cpp similarity index 100% rename from mo/test/t-moMetropolisHastingExplorer.cpp rename to mo/test/t-moMetropolisHastingsExplorer.cpp diff --git a/mo/test/t-moSAexplorer.cpp b/mo/test/t-moSAExplorer.cpp similarity index 100% rename from mo/test/t-moSAexplorer.cpp rename to mo/test/t-moSAExplorer.cpp