Extract PrepareDerivatives

Author: ProExpertProg

cpp/CMakeLists.txt

@@ -62,6 +62,7 @@ add_library(src-lib OBJECT lib/Naive.cpp lib/Naive.hpp lib/HermiteRunner.cpp lib
         lib/Transformer.hpp lib/Transformer.cpp
         lib/Exporter.hpp lib/Exporter.cpp
         lib/Filter.hpp lib/Filter.cpp
+        lib/PrepareDerivatives.hpp lib/PrepareDerivatives.cpp
         lib/Brackets.hpp lib/Brackets.cpp
 )
 target_include_directories(src-lib PUBLIC lib/)

cpp/lib/Brackets.cpp

@@ -1,17 +1,9 @@
 #include "Brackets.hpp"
-#include "Transformer.hpp"
 #include "Filter.hpp"
+#include "Transformer.hpp"
 
 namespace ahr {
 
-void Brackets::prepareDXY_PH(View::C_XY const &view_K, View::C_XY const &viewDX_K,
-                             View::C_XY const &viewDY_K) const {
-  grid.for_each_kxky([&](Dim kx, Dim ky) {
-    viewDX_K(kx, ky) = kx_(kx) * 1i * view_K(kx, ky) * XYNorm;
-    viewDY_K(kx, ky) = ky_(ky) * 1i * view_K(kx, ky) * XYNorm;
-  });
-}
-
 void Brackets::bracket(DxDy<View::R_XY> const &op1, DxDy<View::R_XY> const &op2,
                        View::R_XY const &output) const {
   grid.for_each_xy([&](Dim x, Dim y) {
@@ -21,7 +13,7 @@ void Brackets::bracket(DxDy<View::R_XY> const &op1, DxDy<View::R_XY> const &op2,
 
 void Brackets::derivatives(View::C_XY const &op, DxDy<View::R_XY> output) const {
   DxDy<Buf::C_XY> Der_K{grid.KX, grid.KY};
-  prepareDXY_PH(op, Der_K.DX, Der_K.DY);
+  prepareDXY(op, Der_K);
   tf.bfft(Der_K.DX, output.DX);
   tf.bfft(Der_K.DY, output.DY);
 }

cpp/lib/Brackets.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "constants.hpp"
+#include "PrepareDerivatives.hpp"
 #include "grid.hpp"
 
 namespace ahr {
@@ -16,6 +16,7 @@ class Brackets {
   Grid const &grid;
   Transformer const &tf;
   HouLiFilter const &hlFilter; // TODO vectorized
+  PrepareDerivatives prepareDXY{grid};
 
   using View = Grid::View;
   using Buf = Grid::Buf;
@@ -32,22 +33,8 @@ class Brackets {
   [[nodiscard]] Buf::C_XY fullBracket(View::C_XY op1, View::C_XY op2) const;
 
 private:
-  /// Prepares the δx and δy of viewPH in phase space, as well as over-normalizes
-  /// (after inverse FFT, values will be properly normalized)
-  void prepareDXY_PH(View::C_XY const &view_K, View::C_XY const &viewDX_K,
-                     View::C_XY const &viewDY_K) const;
-
   /// Computes bracket [op1, op2], expects normalized values
   void bracket(DxDy<View::R_XY> const &op1, DxDy<View::R_XY> const &op2,
                View::R_XY const &output) const;
-
-  /// Normalization factor for FFT
-  const Real XYNorm{1.0 / Real(grid.X) / Real(grid.Y)};
-
-  // TODO extract to common utility
-  [[nodiscard]] Real ky_(Dim ky) const {
-    return (ky <= (grid.KY / 2) ? Real(ky) : Real(ky) - Real(grid.KY)) * Real(lx) / Real(ly);
-  }
-  [[nodiscard]] Real kx_(Dim kx) const { return Real(kx); }
 };
 } // namespace ahr

cpp/lib/PrepareDerivatives.cpp

@@ -0,0 +1,12 @@
+#include "PrepareDerivatives.hpp"
+
+namespace ahr {
+
+void PrepareDerivatives::operator()(View::C_XY const &in, DxDy<View::C_XY> out) const {
+  grid.for_each_kxky([&](Dim kx, Dim ky) {
+    out.DX(kx, ky) = kx_(kx) * 1i * in(kx, ky) * XYNorm;
+    out.DY(kx, ky) = ky_(ky) * 1i * in(kx, ky) * XYNorm;
+  });
+}
+
+} // namespace ahr

cpp/lib/PrepareDerivatives.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "constants.hpp"
+#include "grid.hpp"
+
+namespace ahr {
+
+class PrepareDerivatives {
+  using View = Grid::View;
+  template <class T> using DxDy = Grid::DxDy<T>;
+
+public:
+  explicit PrepareDerivatives(Grid const &grid) : grid(grid) {}
+
+  void operator()(View::C_XY const &in, DxDy<View::C_XY> out) const;
+
+private:
+  Grid const &grid;
+
+  /// Normalization factor for FFT
+  const Real XYNorm{1.0 / Real(grid.X) / Real(grid.Y)};
+
+  // TODO extract to common utility
+  [[nodiscard]] Real ky_(Dim ky) const {
+    return (ky <= (grid.KY / 2) ? Real(ky) : Real(ky) - Real(grid.KY)) * Real(lx) / Real(ly);
+  }
+  [[nodiscard]] Real kx_(Dim kx) const { return Real(kx); }
+};
+} // namespace ahr