More changes.

1 files changed, 28 insertions, 21 deletions

diff --git a/tensor.hpp b/tensor.hpp
index 21f2a89..6a5b2c2 100644
--- a/tensor.hpp
+++ b/tensor.hpp
@@ -5,43 +5,52 @@
 
 #include <eigen3/unsupported/Eigen/CXX11/Tensor>
 
+template <class Scalar>
+using Vector = Eigen::Matrix<Scalar, Eigen::Dynamic, 1>;
+
+template <class Scalar>
+using Matrix = Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>;
+
+template <class Scalar, int p>
+using Tensor = Eigen::Tensor<Scalar, p>;
+
 template <class Scalar, int p, std::size_t... Indices>
-Eigen::Tensor<Scalar, p> initializeJHelper(unsigned N, std::index_sequence<Indices...>) {
+Tensor<Scalar, p> initializeJHelper(unsigned N, std::index_sequence<Indices...>) {
   std::array<unsigned, p> Ns;
   std::fill_n(Ns.begin(), p, N);
-  return Eigen::Tensor<Scalar, p>(std::get<Indices>(Ns)...);
+  return Tensor<Scalar, p>(std::get<Indices>(Ns)...);
 }
 
 template <class Scalar, int p>
-Eigen::Tensor<Scalar, p> initializeJ(unsigned N) {
+Tensor<Scalar, p> initializeJ(unsigned N) {
   return initializeJHelper<Scalar, p>(N, std::make_index_sequence<p>());
 }
 
 template <class Scalar, int p, std::size_t... Indices>
-void setJHelper(Eigen::Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind, Scalar val, std::index_sequence<Indices...>) {
+void setJHelper(Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind, Scalar val, std::index_sequence<Indices...>) {
   J(std::get<Indices>(ind)...) = val;
 }
 
 template <class Scalar, int p>
-void setJ(Eigen::Tensor<Scalar, p>& J, std::array<unsigned, p> ind, Scalar val) {
+void setJ(Tensor<Scalar, p>& J, std::array<unsigned, p> ind, Scalar val) {
   do {
     setJHelper<Scalar, p>(J, ind, val, std::make_index_sequence<p>());
   } while (std::next_permutation(ind.begin(), ind.end()));
 }
 
 template <class Scalar, int p, std::size_t... Indices>
-Scalar getJHelper(const Eigen::Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind, std::index_sequence<Indices...>) {
+Scalar getJHelper(const Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind, std::index_sequence<Indices...>) {
   return J(std::get<Indices>(ind)...);
 }
 
 template <class Scalar, int p>
-Scalar getJ(const Eigen::Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind) {
+Scalar getJ(const Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind) {
   return getJHelper<Scalar, p>(J, ind, std::make_index_sequence<p>());
 }
 
 template <class Scalar, int p>
-void iterateOverHelper(Eigen::Tensor<Scalar, p>& J,
-    std::function<void(Eigen::Tensor<Scalar, p>&, std::array<unsigned, p>)>& f,
+void iterateOverHelper(Tensor<Scalar, p>& J,
+    std::function<void(Tensor<Scalar, p>&, std::array<unsigned, p>)>& f,
     unsigned l, std::array<unsigned, p> is) {
   if (l == 0) {
     f(J, is);
@@ -61,17 +70,17 @@ void iterateOverHelper(Eigen::Tensor<Scalar, p>& J,
 }
 
 template <class Scalar, int p>
-void iterateOver(Eigen::Tensor<Scalar, p>& J, std::function<void(Eigen::Tensor<Scalar, p>&, std::array<unsigned, p>)>& f) {
+void iterateOver(Tensor<Scalar, p>& J, std::function<void(Tensor<Scalar, p>&, std::array<unsigned, p>)>& f) {
   std::array<unsigned, p> is;
   iterateOverHelper<Scalar, p>(J, f, p, is);
 }
 
 template <class Scalar, int p, class Distribution, class Generator>
-Eigen::Tensor<Scalar, p> generateCouplings(unsigned N, Distribution d, Generator& r) {
-  Eigen::Tensor<Scalar, p> J = initializeJ<Scalar, p>(N);
+Tensor<Scalar, p> generateCouplings(unsigned N, Distribution d, Generator& r) {
+  Tensor<Scalar, p> J = initializeJ<Scalar, p>(N);
 
-  std::function<void(Eigen::Tensor<Scalar, p>&, std::array<unsigned, p>)> setRandom =
-    [&d, &r] (Eigen::Tensor<Scalar, p>& JJ, std::array<unsigned, p> ind) {
+  std::function<void(Tensor<Scalar, p>&, std::array<unsigned, p>)> setRandom =
+    [&d, &r] (Tensor<Scalar, p>& JJ, std::array<unsigned, p> ind) {
       setJ<Scalar, p>(JJ, ind, d(r));
     };
 
@@ -81,17 +90,15 @@ Eigen::Tensor<Scalar, p> generateCouplings(unsigned N, Distribution d, Generator
 }
 
 template <class Scalar>
-Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>
-contractDown(const Eigen::Tensor<Scalar, 2>& J, const Eigen::Matrix<Scalar, Eigen::Dynamic, 1>& z) {
-  return Eigen::Map<const Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>>(J.data(), z.size(), z.size());
+Matrix<Scalar> contractDown(const Tensor<Scalar, 2>& J, const Vector<Scalar>& z) {
+  return Eigen::Map<const Matrix<Scalar>>(J.data(), z.size(), z.size());
 }
 
 const std::array<Eigen::IndexPair<int>, 1> ip00 = {Eigen::IndexPair<int>(0, 0)};
 
 template <class Scalar, int r>
-Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>
-contractDown(const Eigen::Tensor<Scalar, r>& J, const Eigen::Matrix<Scalar, Eigen::Dynamic, 1>& z) {
-  Eigen::Tensor<Scalar, 1> zT = Eigen::TensorMap<Eigen::Tensor<const Scalar, 1>>(z.data(), {z.size()});
-  Eigen::Tensor<Scalar, r - 1> Jz = J.contract(zT, ip00);
+Matrix<Scalar> contractDown(const Tensor<Scalar, r>& J, const Vector<Scalar>& z) {
+  Tensor<Scalar, 1> zT = Eigen::TensorMap<Tensor<const Scalar, 1>>(z.data(), {z.size()});
+  Tensor<Scalar, r - 1> Jz = J.contract(zT, ip00);
   return contractDown(Jz, z);
 }