merged Dev -> default

kit-parco · Jun 23, 2016 · 69d0b96 · 69d0b96
1 parent 05774b1
commit 69d0b96
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/networkit/cpp/generators/HyperbolicGenerator.cpp b/networkit/cpp/generators/HyperbolicGenerator.cpp
@@ -155,7 +155,6 @@ Graph HyperbolicGenerator::generateCold(const vector<double> &angles, const vect
 	timer.start();
 	vector<double> empty;
 	GraphBuilder result(n, false, false);
-	bool suppressLeft = directSwap ? false : std::is_sorted(angles.begin(), angles.end());//relying on lazy evaluation here
 
 	#pragma omp parallel
 	{

diff --git a/networkit/cpp/generators/quadtree/QuadNode.h b/networkit/cpp/generators/quadtree/QuadNode.h
@@ -585,7 +585,7 @@ class QuadNode {
 		if (isLeaf) {
 			const count lsize = content.size();
 			TRACE("Leaf of size ", lsize);
-			for (int i = 0; i < lsize; i++) {
+			for (index i = 0; i < lsize; i++) {
 				//jump!
 				if (probUB < 1) {
 					double random = Aux::Random::real();
@@ -596,7 +596,6 @@ class QuadNode {
 					if (i >= lsize) break;
 					TRACE("Jumped with delta ", delta, " arrived at ", i);
 				}
-				assert(i >= 0);
 
 				//see where we've arrived
 				candidatesTested++;