derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Derek Christ
2021-08-13 10:50:49 +02:00
parent a098c7fe91
commit fc4118c3dc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DRAMSys/traceAnalyzer/businessObjects/phases/phase.cpp
View File

@@ -184,18 +184,18 @@ std::vector<std::shared_ptr<TracePlotLine>> Phase::getTracePlotLines(const Trace
{
if (getGranularity() == Granularity::Rankwise)
{
return drawingProperties.getBankLinesFromRank(transaction->rank);
return drawingProperties.getBankLinesFromRank(transaction.lock()->rank);
}
else if (getGranularity() == Granularity::Groupwise)
{
return drawingProperties.getBankLinesGroupwise(transaction->rank,
transaction->bank % drawingProperties.banksPerGroup);
return drawingProperties.getBankLinesGroupwise(transaction.lock()->rank,
transaction.lock()->bank % drawingProperties.banksPerGroup);
}
else // if (getGranularity() == Granularity::Bankwise)
{
return drawingProperties.getBankLines(transaction->rank,
transaction->bankgroup % drawingProperties.groupsPerRank,
transaction->bank
return drawingProperties.getBankLines(transaction.lock()->rank,
transaction.lock()->bankgroup % drawingProperties.groupsPerRank,
transaction.lock()->bank
% drawingProperties.banksPerRank
% drawingProperties.banksPerGroup);
}