Commit a348f0f5 authored by Christoph Junghans's avatar Christoph Junghans

fix more warnings

parent e340fe4f
Pipeline #90687170 failed with stages
in 5 minutes and 1 second
......@@ -124,7 +124,7 @@ class BeadStructure {
TOOLS::Graph graph_;
std::set<TOOLS::Edge> connections_;
std::unordered_map<int, T *> beads_;
std::unordered_map<int, TOOLS::GraphNode> graphnodes_;
std::unordered_map<long int, TOOLS::GraphNode> graphnodes_;
};
/**********************
......@@ -228,7 +228,7 @@ bool BeadStructure<T>::isSingleStructure() {
InitializeGraph_();
if (single_structureUpToDate_ == false) {
std::vector<int> vertices = graph_.getVertices();
std::vector<long int> vertices = graph_.getVertices();
if (vertices.size() == 0) {
single_structure_ = false;
return single_structure_;
......
......@@ -116,7 +116,7 @@ void StdAnalysis::WriteAutocorrelation(BondedStatistics &bs,
}
votca::tools::CrossCorrelate c;
c.AutoCorrelate(sel, false);
c.AutoCorrelate(sel);
out.open(args[0]);
out << c << std::endl;
out.close();
......
......@@ -80,9 +80,9 @@ bool BeadMotif::isLine_() {
// all other vertices must be 2
int num_vertices_degree_1 = 0;
vector<int> vertices = reduced_graph_.getVertices();
for (int& vertex : vertices) {
int degree = reduced_graph_.getDegree(vertex);
vector<long int> vertices = reduced_graph_.getVertices();
for (long int& vertex : vertices) {
long int degree = reduced_graph_.getDegree(vertex);
if (degree == 1) {
++num_vertices_degree_1;
} else if (degree == 0) {
......@@ -103,8 +103,8 @@ bool BeadMotif::isLoop_() {
}
// Ensure that the degree of every vertex is 2
vector<int> vertices = graph_.getVertices();
for (int& vertex : vertices) {
vector<long int> vertices = graph_.getVertices();
for (long int& vertex : vertices) {
if (graph_.getDegree(vertex) != 2) {
return false;
}
......@@ -151,8 +151,8 @@ bool BeadMotif::isFusedRing_() {
return false;
}
// Ensure that the degree of every vertex is 2 or greater
vector<int> vertices = graph_.getVertices();
for (int& vertex : vertices) {
vector<long int> vertices = graph_.getVertices();
for (long int& vertex : vertices) {
if (graph_.getDegree(vertex) < 2) {
return false;
}
......
......@@ -309,10 +309,10 @@ void MotifDeconstructor_::deconstructComplexSingleStructures(
calculateEdgesToRemove_(full_graph, remove_edges);
vector<int> all_vertices = full_graph.getVertices();
vector<long int> all_vertices = full_graph.getVertices();
BeadStructure<BaseBead> new_beadstructure;
for (int& vertex : all_vertices) {
for (long int& vertex : all_vertices) {
new_beadstructure.AddBead(id_and_bead_motif.second.getBead(vertex));
}
......
......@@ -34,7 +34,7 @@ vector<BeadStructure<BaseBead>> breakIntoStructures(
decoupleIsolatedSubGraphs(beadstructure.getGraph());
for (Graph &sub_graph : sub_graphs) {
vector<Edge> sub_graph_edges = sub_graph.getEdges();
vector<int> sub_graph_vertices = sub_graph.getVertices();
vector<long int> sub_graph_vertices = sub_graph.getVertices();
BeadStructure<BaseBead> beadstructure_temp;
for (const int &vertex : sub_graph_vertices) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment