Insert entries above blocks of similar entries #222
Conversation
Insert entries above blocks of entries of equivalent generality. This makes that the Python implementation of OC matches (a) the C version for SpiNNaker (b) that described in the HPSR submission. For table ordering, see https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L16-L57 For downcheck preferring to modify more significant bits in merges see https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L285-L292 For merge application, see https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L409-L485
|
@mossblaser - the coverage seems to indicate a problem with stuff touched by #217 rather than by this PR. |
| return routing_entries, aliases | ||
| # Iterate through the old table copying entries acrosss | ||
| insert = 0 | ||
| for remove, entry in enumerate(self.routing_table): |
There was a problem hiding this comment.
I think I would prefer "remove" to be "i" since "remove" does not say "index in the (old) table" to me.
|
Superficial criticisms aside this looks good to me. The coverage issue (as mentioned offline) appears to be a result of coveralls doing something a bit strange and I'll investigate at some other time. As such I'm happy to ignore it for this PR since we've both verified the coverage locally is actually still 100%. |
As suggested by @mossblaser I've retained the brackets in `not (key & bit)` because I feel it's clearer than `not key & bit`.
I would agree :). LGTM! Merge at will once travis is happy. ... I must figure out what's going on with coveralls at some point :/ |
OrderedCovering: Insert entries above blocks of similar entries
|
@rowleya / @alan-stokes - this should improve the compression of the ucolumn tables. |
Insert entries above blocks of entries of equivalent generality. This
makes that the Python implementation of OC matches (a) the C version for
SpiNNaker (b) that described in the HPSR submission.
For table ordering, see
https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L16-L57
For downcheck preferring to modify more significant bits in merges see
https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L285-L292
For merge application, see
https://github.com/project-rig/rig_routing_tables/blob/master/include/ordered_covering.h#L409-L485