From 136fcddcd38d0b8f3b40faf7c1cb7365d9b2a753 Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Fri, 15 Jan 2021 14:45:19 +0100
Subject: Converted more of library to templates accepting generic Scalar types
 and p

---
 tensor.hpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'tensor.hpp')

diff --git a/tensor.hpp b/tensor.hpp
index 66f6d59..21f2a89 100644
--- a/tensor.hpp
+++ b/tensor.hpp
@@ -5,43 +5,41 @@
 
 #include <eigen3/unsupported/Eigen/CXX11/Tensor>
 
-#include "factorial.hpp"
-
-template <class Scalar, unsigned p, std::size_t... Indices>
+template <class Scalar, int p, std::size_t... Indices>
 Eigen::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)...);
 }
 
-template <class Scalar, unsigned p>
+template <class Scalar, int p>
 Eigen::Tensor<Scalar, p> initializeJ(unsigned N) {
   return initializeJHelper<Scalar, p>(N, std::make_index_sequence<p>());
 }
 
-template <class Scalar, unsigned p, std::size_t... Indices>
+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...>) {
   J(std::get<Indices>(ind)...) = val;
 }
 
-template <class Scalar, unsigned p>
+template <class Scalar, int p>
 void setJ(Eigen::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, unsigned p, std::size_t... Indices>
+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...>) {
   return J(std::get<Indices>(ind)...);
 }
 
-template <class Scalar, unsigned p>
+template <class Scalar, int p>
 Scalar getJ(const Eigen::Tensor<Scalar, p>& J, const std::array<unsigned, p>& ind) {
   return getJHelper<Scalar, p>(J, ind, std::make_index_sequence<p>());
 }
 
-template <class Scalar, unsigned 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,
     unsigned l, std::array<unsigned, p> is) {
@@ -62,13 +60,13 @@ void iterateOverHelper(Eigen::Tensor<Scalar, p>& J,
   }
 }
 
-template <class Scalar, unsigned p>
+template <class Scalar, int p>
 void iterateOver(Eigen::Tensor<Scalar, p>& J, std::function<void(Eigen::Tensor<Scalar, p>&, std::array<unsigned, p>)>& f) {
   std::array<unsigned, p> is;
   iterateOverHelper<Scalar, p>(J, f, p, is);
 }
 
-template <class Scalar, unsigned p, class Distribution, class Generator>
+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);
 
-- 
cgit v1.2.3-54-g00ecf