From 3590ea64a5804dcee87e61d8a9a9969d918bff26 Mon Sep 17 00:00:00 2001 From: Jens Date: Tue, 10 Dec 2019 14:18:15 +0100 Subject: [PATCH 1/3] changed long int to Eigen::Index --- include/votca/tools/types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/votca/tools/types.h b/include/votca/tools/types.h index a87537be..24509216 100644 --- a/include/votca/tools/types.h +++ b/include/votca/tools/types.h @@ -18,9 +18,10 @@ #ifndef _VOTCA_TOOLS_TYPES_H #define _VOTCA_TOOLS_TYPES_H +#include namespace votca { -using Index = long int; +using Index = Eigen::Index; } // namespace votca From bbee4de3dc74743c2377bc9bdd48fbf70986089f Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 10 Dec 2019 09:27:19 -0700 Subject: [PATCH 2/3] make Edge::getOtherEndPoint index type --- src/libtools/edge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtools/edge.cc b/src/libtools/edge.cc index 47f12249..562f97cf 100644 --- a/src/libtools/edge.cc +++ b/src/libtools/edge.cc @@ -31,7 +31,7 @@ Edge::Edge(Index ID1, Index ID2) { vertices_ = vector{min({ID1, ID2}), max({ID1, ID2})}; } -long Edge::getOtherEndPoint(Index ver) const { +Index Edge::getOtherEndPoint(Index ver) const { if (ver == vertices_.front()) { return vertices_.back(); } else { From 8e769a337672db4316bda91425cf814e546e5efe Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 10 Dec 2019 09:59:15 -0700 Subject: [PATCH 3/3] Graph::getDegree index type --- src/libtools/graph.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtools/graph.cc b/src/libtools/graph.cc index fce9fc8e..b30b4456 100644 --- a/src/libtools/graph.cc +++ b/src/libtools/graph.cc @@ -134,7 +134,7 @@ void Graph::calcId_() { return; } -long Graph::getDegree(Index vertex) const { +Index Graph::getDegree(Index vertex) const { if (edge_container_.vertexExist(vertex)) { return edge_container_.getDegree(vertex); }