renamed module to LPmade

Author: jtreanor

.gitignore

@@ -1,6 +1,6 @@
 build/
-netlib.py
-netlib_wrap.cpp
+LPmade.py
+LPmade_wrap.cpp
 __pycache__
 *.pyc
 .DS_Store

README.md

@@ -19,7 +19,7 @@ Or:
 The API is largely identical to the C++ library, with a few useful additions. For example:
 
 ```
-from netlib import *
+from LPmade import *
 
 #Load network from disk
 network = WeightedNetwork.readNetworkNamed("COMPLETE.net")

netlib.i

@@ -12,6 +12,7 @@ LPmade is free software: you can redistribute it and/or modify it under the term
 #include <limits>
 #include "LinkPredictor.h"
 #include <math.h>
+#include <tuple>
 
 using std::numeric_limits;
 using std::cout;
@@ -24,6 +25,7 @@ double zScore(double value,double standard_deviation,double mean) {
 }
 
 LinkPredictor::LinkPredictor( const WeightedNetwork& network, const WeightedNetwork& completeNetwork ) : network(network), completeNetwork(completeNetwork), vertex(INVALID_VERTEX), neighbor(INVALID_VERTEX) {
+	srand(time(0));
 }
 
 LinkPredictor::~LinkPredictor() {
@@ -89,15 +91,15 @@ std::vector<double> LinkPredictor::allNormalised(unsigned int vertex) {
 }
 
 std::vector<vertex_t> LinkPredictor::topNVertices(unsigned int vertex, int n) {
-	std::priority_queue< std::pair<double, int> , vector< std::pair<double, int> >, PairCompare > q;
+	std::priority_queue< std::tuple<double, int ,int> > q;
 	for (unsigned int i = 0; i < this->network.vertexCount(); ++i) {
-		q.push(std::pair<double, int>( generateScoreIfNotNeighborsInt(vertex,i) , i));
+		q.push(std::make_tuple(generateScoreIfNotNeighborsInt(vertex,i) , rand(), i) );
 	}
 
 	std::vector<vertex_t> topVertices;
 
 	for (int i = 0; i < n; ++i) {
-		topVertices.push_back(q.top().second);
+		topVertices.push_back(std::get<2>(q.top()));
 		q.pop();
 	}
 

netlib/LinkPredictor/LinkPredictor.cpp

@@ -11,8 +11,8 @@
     flag for flag in opt.split() if flag != '-Wstrict-prototypes'
 )
 
-net_lib_module = Extension('_netlib',
-                           sources=['netlib.i',
+net_lib_module = Extension('_LPmade',
+                           sources=['LPmade.i',
                            			"netlib/WeightedNetwork.cpp",
 									"netlib/Statistics.cpp",
 									"netlib/LinkPredictor/LinkPredictor.cpp",
@@ -54,10 +54,10 @@
 			                       extra_compile_args=["-std=c++0x"],
                            )
 
-setup (name = 'netlib',
+setup (name = '	LPmade',
        version = '0.1',
        author      = "James Treanor",
-       description = """netlib wrapper""",
+       description = """LPmade wrapper""",
        ext_modules = [net_lib_module],
-       py_modules = ["netlib"],
+       py_modules = ["LPmade"],
        )