Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix IRR calculation for securities with portfolio transfer #1898

Merged
merged 2 commits into from Dec 24, 2020
Merged

Fix IRR calculation for securities with portfolio transfer #1898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7e4a53
Fix IRR calculation for securities with portfolio transfer
inv-trad Dec 20, 2020
9205ed4
Fix fifo for trades of securities with portfolio transfer
inv-trad Dec 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions name.abuchen.portfolio/src/name/abuchen/portfolio/snapshot/trades/Trade.java
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;

Expand Down Expand Up @@ -77,6 +78,13 @@ public Trade(Security security, Portfolio portfolio, long shares)
.sum() / (double) shares);
}

// let's sort again because the list might not be sorted anymore due to transfers
Collections.sort(transactions,
(p1, p2) -> p1.getTransaction().getDateTime().compareTo(p2.getTransaction().getDateTime()));

// re-set start date from first entry after sorting
this.setStart(transactions.get(0).getTransaction().getDateTime());

calculateIRR(converter);
}

Expand Down
4 changes: 4 additions & 0 deletions name.abuchen.portfolio/src/name/abuchen/portfolio/snapshot/trades/TradeCollector.java
View file
Open in desktop
Expand Up @@ -113,6 +113,10 @@ private Trade createNewTradeFromSell(Map<Portfolio, List<TransactionPair<Portfol
pair.getTransaction().getSecurity(), pair.getOwner(), pair));

long sharesToDistribute = pair.getTransaction().getShares();

// sort open to get fifo
Collections.sort(open,
(p1, p2) -> p1.getTransaction().getDateTime().compareTo(p2.getTransaction().getDateTime()));

for (TransactionPair<PortfolioTransaction> candidate : new ArrayList<>(open))
{
Expand Down