From 177b3c93c40bbeb9b5846d1f0a4f1d4b7b0e152d Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Thu, 5 Dec 2013 18:34:42 -0800
Subject: [PATCH] Move DecayingSample to algorithm

---
 Builds/VisualStudio2012/RippleD.vcxproj                     | 2 +-
 Builds/VisualStudio2012/RippleD.vcxproj.filters             | 6 +++---
 .../{resource/impl => algorithm/api}/DecayingSample.h       | 6 ++----
 src/ripple/resource/ripple_resource.cpp                     | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename src/ripple/{resource/impl => algorithm/api}/DecayingSample.h (95%)

diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 64ee71e238..07685c299c 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -2099,6 +2099,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\ripple\algorithm\api\CycledSet.h" />
+    <ClInclude Include="..\..\src\ripple\algorithm\api\DecayingSample.h" />
     <ClInclude Include="..\..\src\ripple\algorithm\api\DiscreteClock.h" />
     <ClInclude Include="..\..\src\ripple\http\api\Handler.h" />
     <ClInclude Include="..\..\src\ripple\http\api\Server.h" />
@@ -2151,7 +2152,6 @@
     <ClInclude Include="..\..\src\ripple\resource\api\LegacyFees.h" />
     <ClInclude Include="..\..\src\ripple\resource\api\Manager.h" />
     <ClInclude Include="..\..\src\ripple\resource\api\Types.h" />
-    <ClInclude Include="..\..\src\ripple\resource\impl\DecayingSample.h" />
     <ClInclude Include="..\..\src\ripple\resource\impl\Entry.h" />
     <ClInclude Include="..\..\src\ripple\resource\impl\Import.h" />
     <ClInclude Include="..\..\src\ripple\resource\impl\Key.h" />
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 0da0204d0c..787623a4ae 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -2502,9 +2502,6 @@
     <ClInclude Include="..\..\src\ripple\resource\api\Manager.h">
       <Filter>[1] Ripple\resource\api</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\ripple\resource\impl\DecayingSample.h">
-      <Filter>[1] Ripple\resource\impl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\ripple\resource\impl\Kind.h">
       <Filter>[1] Ripple\resource\impl</Filter>
     </ClInclude>
@@ -2850,6 +2847,9 @@
     <ClInclude Include="..\..\src\ripple_app\ledger\LedgerCleaner.h">
       <Filter>[2] Old Ripple\ripple_app\ledger</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\ripple\algorithm\api\DecayingSample.h">
+      <Filter>[1] Ripple\algorithm\api</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\ripple_data\protocol\ripple.proto">
diff --git a/src/ripple/resource/impl/DecayingSample.h b/src/ripple/algorithm/api/DecayingSample.h
similarity index 95%
rename from src/ripple/resource/impl/DecayingSample.h
rename to src/ripple/algorithm/api/DecayingSample.h
index 192b59bed9..c44764ee88 100644
--- a/src/ripple/resource/impl/DecayingSample.h
+++ b/src/ripple/algorithm/api/DecayingSample.h
@@ -17,11 +17,10 @@
 */
 //==============================================================================
 
-#ifndef RIPPLE_RESOURCE_DECAYINGSAMPLE_H_INCLUDED
-#define RIPPLE_RESOURCE_DECAYINGSAMPLE_H_INCLUDED
+#ifndef RIPPLE_ALGORITHM_DECAYINGSAMPLE_H_INCLUDED
+#define RIPPLE_ALGORITHM_DECAYINGSAMPLE_H_INCLUDED
 
 namespace ripple {
-namespace Resource {
 
 /** Sampling function using exponential decay to provide a continuous value. */
 template <int Window,
@@ -92,7 +91,6 @@ private:
     elapsed_type m_when;
 };
 
-}
 }
 
 #endif
diff --git a/src/ripple/resource/ripple_resource.cpp b/src/ripple/resource/ripple_resource.cpp
index c468bc224a..ac5c57ede0 100644
--- a/src/ripple/resource/ripple_resource.cpp
+++ b/src/ripple/resource/ripple_resource.cpp
@@ -21,6 +21,7 @@
 
 #include "ripple_resource.h"
 
+#include "../algorithm/api/DecayingSample.h"
 #include "../algorithm/api/DiscreteClock.h"
 
 #include "beast/modules/beast_core/system/BeforeBoost.h"
@@ -29,7 +30,6 @@
 #include "impl/Fees.cpp"
 #  include "impl/Kind.h"
 # include "impl/Key.h"
-#  include "impl/DecayingSample.h"
 #  include "impl/Tuning.h"
 # include "impl/Entry.h"
 # include "impl/Import.h"