Skip to content

refactor roots & list names; smash case - #320

Merged
jteresco merged 2 commits into
TravelMapping:masterfrom
yakra:hash
May 14, 2020
Merged

refactor roots & list names; smash case#320
jteresco merged 2 commits into
TravelMapping:masterfrom
yakra:hash

Conversation

@yakra

@yakrayakra commented May 4, 2020

Copy link
Copy Markdown
Contributor

Python:
2/3 the processing time, 3/2 the speed, Processing traveler list files

C++
Less of an improvement than I'd have hoped for, but it's still something. This helps out most on BiggaTomato, my system most constrained by memory bandwidth & cache size. (Well... there's also my laptop, with its 512K L2 cache. I'm not even bothering testing speed on that single-core dinosaur.)
Compare the graphs in #313:
List2_24

 * Refactor checks for root & list name uniqueness and Route/ConnectedRoute correspondence for improved efficiency & error reporting and more concise code (TravelMapping#316)
* Perform fewer case conversions on AltLabels & AltRouteNames for increased speed Processing traveler list files (TravelMapping#319)
* C++: clean up a couple classes' static member definitions
@yakra

yakra commented May 8, 2020

Copy link
Copy Markdown
ContributorAuthor

I wrote:

I'll hold off on a pull request until the errors are fixed on the HighwayData side.

Oops, guess I forgot I said that. :)

Still waiting on 3 fixes:

[85.8] ABORTING due to 9 errors:
1: Duplicate alt route name in tur.o005gor: 'TUR O5gor' already points to tur.o005gor
2: Duplicate alt route name in tur.o005akh: 'TUR O5akh' already points to tur.o005akh

3: Duplicate main list name in ar.ar549: 'AR AR549' already points to ar.i049tex

@jteresco

Copy link
Copy Markdown
Contributor

Good to go now?

 * Retrieve elements by value rather than reference. Same principle as in #270, just without the big speed increase. Best practice nonetheless.
* Convert traditional for loops to range for loops where possible, for cleaner more concise code.
@yakra

Copy link
Copy Markdown
ContributorAuthor

Good to go now?

The last conflict, AR549, was fixed about 7 hours ago. Good to go.

@jteresco
jteresco merged commit 5de9946 into TravelMapping:masterMay 14, 2020
@yakra
yakra deleted the hash branch May 24, 2020 15:32
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

smash case Checking for duplicate list names .list processing: lower() -> upper()

2 participants

@yakra@jteresco