Commit ed6df9d4 authored by Julien Muchembled's avatar Julien Muchembled

Remove trailing whitespaces

parent 7d4346a9
......@@ -31,12 +31,12 @@ class PeerManager:
def _declare(self):
if self._external_ip != None:
utils.log('Declaring our connections info', 3)
utils.log('Declaring our connections info', 3)
self._proxy.declare((self._internal_ip, self._external_ip, self._external_port, self._proto))
else:
utils.log('Warning : could not declare the external ip because it is unknown', 4)
def _populate(self):
def _populate(self):
utils.log('Populating the peers DB', 2)
new_peer_list = self._proxy.getPeerList(self._db_size, self._internal_ip)
self._db.executemany("INSERT OR IGNORE INTO peers (ip, port, proto, used) VALUES (?,?,?,0)", new_peer_list)
......
......@@ -17,7 +17,7 @@ class RingMember:
return str(self.id) + ' ' + self.ip + ' ' + str(self.port)
class Ring:
def __init__(self, entryPoint):
# initialize the connection
self.sock = socket.socket( socket.AF_INET6, socket.SOCK_DGRAM )
......@@ -64,7 +64,7 @@ class Ring:
# if n < x && x < self.successor:
# self.successor = x
# SEND notify self.ip, self.id TO self.successor
# def notify(self, n2)
# if self.predecessor == None || (predecessor < n2 && n2 < n):
# self.predecessor = n2
......@@ -73,7 +73,7 @@ class Ring:
# def fixFingers(self)
# next = (next + 1) mod (nFingers) # Or Random, cf google
# finger[next] = find_successor(n+2^{next-1});
# to be called periodically
# def checkPredecessor(self)
# if NO PING from self.predecessor:
......
......@@ -86,7 +86,7 @@ class main(object):
server4.register_instance(self)
server6 = SimpleXMLRPCServer6(('::', self.config.port), requestHandler=RequestHandler, allow_none=True)
server6.register_instance(self)
# Main loop
while True:
try:
......@@ -169,7 +169,7 @@ class main(object):
return crypto.dump_certificate(crypto.FILETYPE_PEM, self.ca)
def getBootstrapPeer(self, handler):
# TODO: Insert a flag column for bootstrap ready servers in peers
# TODO: Insert a flag column for bootstrap ready servers in peers
# ( servers which shouldn't go down or change ip and port as opposed to servers owned by particulars )
# that way, we also ascertain that the server sent is not the new node....
ip, port, proto = self.db.execute("SELECT ip, port, proto FROM peers ORDER BY random() LIMIT 1").next()
......
......@@ -3,7 +3,7 @@
#include <map>
#include <queue>
Graph::Graph(int size, int k, int maxPeers, mt19937& rng) :
Graph::Graph(int size, int k, int maxPeers, mt19937& rng) :
distrib(uniform_int_distribution<int>(0, size-1)),
size(size), generator(rng)
{
......@@ -17,9 +17,9 @@ Graph::Graph(int size, int k, int maxPeers, mt19937& rng) :
{
int otherNode;
while(alreadyConnected.count(otherNode = distrib(rng)) == 1
while(alreadyConnected.count(otherNode = distrib(rng)) == 1
|| otherNode > i && adjacency[otherNode].size() > maxPeers-10
|| adjacency[otherNode].size() > maxPeers)
|| adjacency[otherNode].size() > maxPeers)
{ }
adjacency[i].push_back(otherNode);
adjacency[otherNode].push_back(i);
......@@ -75,7 +75,7 @@ int Graph::CountUnreachableFrom(int node)
unAccessible--;
toVisit.pop();
}
return unAccessible;
}
......@@ -156,7 +156,7 @@ void MinCutGraph::Merge(int nMerge, mt19937& rng)
int n1 = edges[eId].v.first;
int n2 = edges[eId].v.second;
// anilate n2
nodes[n2].null = true;
......
......@@ -49,16 +49,16 @@ int main(int argc, char** argv)
for(float a=0.01; a<=1; a+=0.05)
{
int seed = rng();
outputStrings.push_back(async(launch::async, [seed, n, k, a]()
outputStrings.push_back(async(launch::async, [seed, n, k, a]()
{
Results results = Simulate(seed, n, k, 3*k, 10000, a, 1);
ostringstream out;
out << n << "," << k << "," << a << "," << 3*k << ","
<< results.avgDistance << ","
<< results.disconnected << ","
<< results.disconnectionProba << ","
out << n << "," << k << "," << a << "," << 3*k << ","
<< results.avgDistance << ","
<< results.disconnected << ","
<< results.disconnectionProba << ","
<< results.maxDistanceReached << ","
<< results.arityDistrib[3*k] << ","
<< results.arityDistrib[3*k] << ","
<< results.minKConnexity << ","
<< results.avgAccessibility
<< endl;
......
......@@ -9,7 +9,7 @@ using namespace std;
template<class T>
struct nullable
{
{
T v;
bool null;
......@@ -75,7 +75,7 @@ public:
double arityTooBig;
double distanceTooBig;
int64_t disconnected;
int maxArity;
int maxDistance;
......
#include "main.h"
Results::Results(int maxArity, int maxDistance) :
Results::Results(int maxArity, int maxDistance) :
maxArity(maxArity), maxDistance(maxDistance)
{
arityDistrib = new double[maxArity+1];
......@@ -54,7 +54,7 @@ void Results::AddDistanceSample(int distance)
{
if(distance == -1)
disconnected++;
else
else
{
avgDistance += distance;
if(distance <= maxDistance)
......
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