Skip to content

Issue #147: combine duplicate boxes at the generational level #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 29, 2017

Conversation

fire-eggs
Copy link
Contributor

  1. For descendant chart.
  2. Has no negative impact on existing charts.
  3. For the specific case shown in issue Full Family Tree #147, combines 'duplicate' boxes

Limitation: 'duplicate' boxes can only be combined at the same generational level. 'Duplicates' across generational rows are not combined with this commit.

Limitation: in the specific case shown in issue #147, the "combined" boxes are placed a little "off center". The resulting appearance is not as "nice" as it could be.

@codecov-io
Copy link

Codecov Report

Merging #163 into master will decrease coverage by 0.01%.
The diff coverage is 27.91%.

@@            Coverage Diff             @@
##           master     #163      +/-   ##
==========================================
- Coverage   79.35%   79.34%   -0.01%     
==========================================
  Files         437      437              
  Lines       58535    58578      +43     
  Branches     5060     5071      +11     
==========================================
+ Hits        46448    46474      +26     
- Misses      10851    10866      +15     
- Partials     1236     1238       +2
Impacted Files Coverage Δ
projects/GKCore/GKCore/Charts/TreeChartModel.cs 65.92% <27.91%> (-1.75%) ⬇️
projects/GKCore/Externals/ListTimSort.cs 80.84% <0%> (+2.79%) ⬆️

// Check for, and correct, collisions of boxes in this person's
// generational row.
int shiftAmount = 0;
for (int m = 0; m <= fPersons.Count; m++)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not a mistake by accident?
m <= fPersons.Count

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup, it is. Good eye! [There is a loop short-circuit which appears to have prevented it from being an issue in during my testing.]

Copy link
Owner

@Serg-Norseman Serg-Norseman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good code, I will need to test everything :)

@Serg-Norseman Serg-Norseman changed the base branch from master to feature/full-tree November 29, 2017 20:01
@Serg-Norseman Serg-Norseman merged commit 76ac0c6 into Serg-Norseman:feature/full-tree Nov 29, 2017
@Serg-Norseman
Copy link
Owner

I am sorry :( but...
see the attached file, with descendants from "Sidorov Dmitriy Andreevich"
FullFamilyTreeTests.zip

@Serg-Norseman
Copy link
Owner

I'll try to think about how to rebuild the algorithm one of these days. Maybe something will turn out ...

@fire-eggs
Copy link
Contributor Author

fire-eggs commented Nov 30, 2017 via email

@Serg-Norseman
Copy link
Owner

Kevin, it's okay! I am always glad to consider any additions to this project and I am happy with any participation :)

I still can not get and think about possible ways to implement the "Full Tree". Work takes up all resources. Perhaps in a week or two there will be additional free time. There are a couple of ideas on how to extend the mapping of branches under the current engine. However, these ideas do not yet relate to how to combine duplicate information.

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.

3 participants