Skip to content

Sort colocated waypoint lists; close various minor issues - #144

Merged
jteresco merged 10 commits into
TravelMapping:masterfrom
yakra:siteupdate_CWN
Dec 20, 2018
Merged

Sort colocated waypoint lists; close various minor issues#144
jteresco merged 10 commits into
TravelMapping:masterfrom
yakra:siteupdate_CWN

Conversation

@yakra

@yakrayakra commented Dec 3, 2018

Copy link
Copy Markdown
Contributor
  • Canonical Waypoint Names are deterministic now. I've not yet looked into how DIFFable graph files are.
  • Deterministic waypointsimplification.log.
  • concurrencies.log:
    Deterministic concurrency detection portion. I've not yet addressed the per-traveler augments.
  • highwaydatastats.log:
    I didn't set out to make this deterministic, but 10 single-threaded trials & 10 multi-threaded trials have no DIFFs other than the initial Travel Mapping highway mileage as of ... line. OK! :)

This allows me to simplify the code for my earlier modifications to the VISIBLE_HIDDEN_COLOC and HIDDEN_JUNCTION datachecks.

Takes 1.6-1.7 seconds on my machine. Will be a little faster on Noreaster.
I think DIFFs are worthwhile. :)

@yakra

Copy link
Copy Markdown
ContributorAuthor

12f00bd closes #133

@yakra

Copy link
Copy Markdown
ContributorAuthor

ed5e912 closes #134

@yakra

Copy link
Copy Markdown
ContributorAuthor

eccdb9b closes #140

@yakra

Copy link
Copy Markdown
ContributorAuthor

d0cca48 closes #142

@yakra

Copy link
Copy Markdown
ContributorAuthor
  • highwaydatastats.log:
    I didn't set out to make this deterministic, but 10 single-threaded trials & 10 multi-threaded trials have no DIFFs other than the initial Travel Mapping highway mileage as of ... line. OK! :)

That was the case for logs produced on noreaster. Not the case on my home machine. I've noticed differences in the way the FreeBSD and Ubuntu Python flavors iterate thru some container formats, such as dicts. I'll take a closer look at this later on.

@yakra

Copy link
Copy Markdown
ContributorAuthor

6b2688c closes #145

@yakra

Copy link
Copy Markdown
ContributorAuthor

6c8512a closes #146

@yakra

Copy link
Copy Markdown
ContributorAuthor

81d87af closes #149

@yakrayakra changed the title Sort colocated waypoint listsSort colocated waypoint lists; closa various minor issuesDec 13, 2018
@yakrayakra changed the title Sort colocated waypoint lists; closa various minor issuesSort colocated waypoint lists; close various minor issuesDec 13, 2018
@yakra

yakra commented Dec 14, 2018

Copy link
Copy Markdown
ContributorAuthor

I may have goofed in my fix for #134. Will look into this.

Edit: I goofed.
return self.route.region + " " + self.route.route + " " + self.waypoint1.label + " " + self.waypoint2.label
->
return self.route.readable_name() + " " + self.waypoint1.label + " " + self.waypoint2.label

I'll test it out before committing, because it's now established that I can be careless. 8)

done incorrectly in ed5e912
@yakra

Copy link
Copy Markdown
ContributorAuthor

Tested. Fixed in dc8a05c.

@jteresco

Copy link
Copy Markdown
Contributor

Sorry I have not been following this one much. Is it ready to merge in and be used in production going forward?

@yakra

Copy link
Copy Markdown
ContributorAuthor

It is.

Currently testing out a datacheck for the OP in #57, which can be in a separate pull request.

@jteresco
jteresco merged commit 73a2236 into TravelMapping:masterDec 20, 2018
@yakra
yakra deleted the siteupdate_CWN branch December 28, 2018 07:04
Sign up for freeto 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.

2 participants

@yakra@jteresco