Skip to content

Conversation

gabri94
Copy link
Contributor

@gabri94 gabri94 commented Nov 11, 2014

I've corrected the diff function. the networkx.difference function is not usable to make the diff beetween two graph with different node sets. I've implemented the difference between to graph, removing the node that are in graph a from graph b.

I've created a Subgraph generator using the @leonardomaccari function.

With this function i've built a test for olsr1parser

@nemesifier
Copy link
Member

build is failing, checkout why:
https://travis-ci.org/ninuxorg/netdiff/jobs/40667349

"TabError: inconsistent use of tabs and spaces in indentation"

@nemesifier
Copy link
Member

on python3 mixing tabs and spaces its not allowed, enable whitespace characters in your editor so you can spot tabs (marked usually as arrows).

@leonardomaccari
Copy link
Contributor

seems to me it doesn't work anyway. you are missing the nodes/edges that are in the new graph but not in the old one. You have to add them back in the diff.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 3a3f20c on gabri94:master into ca855c3 on ninuxorg:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 96f3a3b on gabri94:master into ca855c3 on ninuxorg:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 48b40b0 on gabri94:master into ca855c3 on ninuxorg:master.

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 6f78e9f on gabri94:master into ca855c3 on ninuxorg:master.

@gabri94
Copy link
Contributor Author

gabri94 commented Nov 11, 2014

@leonardomaccari I solve that problem doing the differerence on the two combinations of the graphs. One result will be the addedd nodes and the other the removed nodes.

The real problem was that the old function were removing nodes that were in both graph, but we're interested in removing edges, not nodes!

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling d023582 on gabri94:master into 17838cf on ninuxorg:master.

removed old code, now test works!!!!

corrected bug for py3

maybe this time will work

Corrected the difference function, now it return the difference between the edges of 2 graph.
Made a new test for the parser.
Fixed weight in json generation.
@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling d9289ad on gabri94:master into 17838cf on ninuxorg:master.

@nemesifier nemesifier merged commit d9289ad into openwisp:master Nov 14, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants