Skip to content

170 receive complete message graph #180

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

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

170 receive complete message graph #180

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
43a124e
Add flag
matildeRivas Jun 18, 2025
5d61ca9
Add flag
matildeRivas Jun 18, 2025
a43a430
Refactor get messages
matildeRivas Jun 24, 2025
ea9f067
Merge remote-tracking branch 'origin/170-receive-complete-message-gra…
matildeRivas Jun 24, 2025
b07a9e2
Get all messages
matildeRivas Jun 24, 2025
8ff2c0d
Get all messages
matildeRivas Jun 24, 2025
e2025e0
Update target results
matildeRivas Jul 8, 2025
08d0d7b
update branch
matildeRivas Sep 10, 2025
4918340
only get complete message graph when flag is present
matildeRivas Sep 10, 2025
7bd3cf6
Add portugal and utils
matildeRivas Sep 10, 2025
073f6eb
Merge remote-tracking branch 'origin/main' into 170-receive-complete-…
matildeRivas Sep 10, 2025
323fe88
update target results, messages for same period are processed differe…
matildeRivas Sep 10, 2025
dd0546c
add all-messages to test
matildeRivas Sep 11, 2025
9fa9696
update windows test
matildeRivas Sep 11, 2025
dc8c54f
autoformat
fdobad Sep 12, 2025
3148ec8
silent if not debugging
fdobad Sep 12, 2025
081857f
test robustness improvements
fdobad Sep 12, 2025
ff91871
remove all messages testing in windows
matildeRivas Sep 16, 2025
1e60e2b
Merge remote-tracking branch 'origin/170-receive-complete-message-gra…
matildeRivas Sep 16, 2025
08fa3a8
undo last commit
matildeRivas Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
179 changes: 88 additions & 91 deletions Cell2Fire/Cell2Fire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1414,107 +1414,102 @@ Cell2Fire::GetMessages(const std::unordered_map<int, std::vector<int>>& sendMess
if (this->messagesSent && !this->repeatFire)
{

// frequency array
std::unordered_map<int, int> globalMessagesList;
for (auto& sublist : sendMessageList)
{
for (int val : sublist.second)
{
if (globalMessagesList.find(val) == globalMessagesList.end())
{
globalMessagesList[val] = 1;
}
else
{
globalMessagesList[val] = globalMessagesList[val] + 1;
}
}
}

// Initialize cells if needed (getting messages)
for (auto& _bc : globalMessagesList)
{
int bc = _bc.first;
if (this->Cells_Obj.find(bc) == this->Cells_Obj.end()
&& this->burntCells.find(bc) == this->burntCells.end())
{
// Initialize cell, insert it inside the unordered map
InitCell(bc);
it = this->Cells_Obj.find(bc);
}
}

// Get burnt loop
if (this->args.verbose)
{
for (auto& _bc : globalMessagesList)
{
printf("CELL %d inside global message list \n", _bc.first);
}
}

std::unordered_set<int> burntList;
bool checkBurnt;
for (auto& _bc : globalMessagesList)
// frequency array
// std::unordered_map<int, int> globalMessagesList;
for (auto& sublist : sendMessageList)
{
// printf("\n\nWE ARE DEBUGGING!!!! CELL TO BE ANALYZED GET BURNT IS
// %d\n", _bc.first);
int bc = _bc.first;
if (this->burntCells.find(bc) == this->burntCells.end())
for (int bc : sublist.second)
{
if (this->Cells_Obj.find(bc) == this->Cells_Obj.end())
if (this->Cells_Obj.find(bc) == this->Cells_Obj.end()
&& this->burntCells.find(bc) == this->burntCells.end())
{

// Initialize cell, insert it inside the unordered map
InitCell(bc);
it = this->Cells_Obj.find(bc);
}
else
it = this->Cells_Obj.find(bc);

// Check if burnable, then check potential ignition
if (it->second.fType != 0)
{
checkBurnt = it->second.get_burned(this->fire_period[this->year - 1],
1,
this->year,
df,
this->coef_ptr,
this->args_ptr,
&this->wdf[this->weatherPeriod],
this->activeCrown,
this->perimeterCells);
}
else
if ((this->burntCells.find(bc) == this->burntCells.end() && !this->args_ptr->AllMessages)
|| this->args_ptr->AllMessages)
{
checkBurnt = false;
}
if (this->Cells_Obj.find(bc) == this->Cells_Obj.end())
{

// Print-out regarding the burnt cell
if (this->args.verbose)
{
std::cout << "\nCell " << it->second.realId << " got burnt (1 true, 0 false): " << checkBurnt
<< std::endl;
}
// Initialize cell, insert it inside the unordered map
InitCell(bc);
it = this->Cells_Obj.find(bc);
}
else
it = this->Cells_Obj.find(bc);

// Update the burntlist
if (checkBurnt)
{
burntList.insert(it->second.realId);
// Check if burnable, then check potential ignition
if (it->second.fType != 0)
{
checkBurnt = it->second.get_burned(this->fire_period[this->year - 1],
1,
this->year,
df,
this->coef_ptr,
this->args_ptr,
&this->wdf[this->weatherPeriod],
this->activeCrown,
this->perimeterCells);
}
else
{
checkBurnt = false;
}

// Cleaning step
// Fire can't be propagated back
int cellNum = it->second.realId - 1;
for (auto& angle : it->second.angleToNb)
// Print-out regarding the burnt cell
if (this->args.verbose)
{
int origToNew = angle.first;
// Which neighbor am I to the burnt cell
int newToOrig = (origToNew + 180) % 360;
int adjCellNum = angle.second; // Check
auto adjIt = Cells_Obj.find(adjCellNum);
if (adjIt != Cells_Obj.end())
std::cout << "\nCell " << it->second.realId << " got burnt (1 true, 0 false): " << checkBurnt
<< std::endl;
}

// Update the burntlist
if (checkBurnt)
{
burntList.insert(it->second.realId);

// emitter->second.ROSAngleDir.erase()
// std::cout << "step " << this->fire_period[this->year - 1] << " Cell " << it->second.realId
// << " got burnt by " << emitter->second.realId << " with emitter angle to nb "
// << emitter->second.angleDict[it->second.realId] << endl;
if (this->args_ptr->AllMessages)
{
adjIt->second.ROSAngleDir.erase(newToOrig);
auto emitter = this->Cells_Obj.find(sublist.first);
emitter->second.ROSAngleDir.erase(emitter->second.angleDict[it->second.realId]);
it->second.ROSAngleDir.erase(it->second.angleDict[sublist.first]);
/*cout << "burned " << bc << endl;
cout << "\t from " << emitter->second.realId << " erased " << it->second.realId << " angle "
<< emitter->second.angleDict[it->second.realId] << endl;
cout << "\t from " << it->second.realId << " erased " << emitter->second.realId << " angle "
<< it->second.angleDict[emitter->second.realId] << endl;
*/
}
else
{
auto lt = this->availCells.find(bc);
if (lt != this->availCells.end())
{
this->availCells.erase(bc);
// cout << this->fire_period[0] << " erased from availCells " << bc << endl;
}
for (auto& angle : it->second.angleToNb)
{
int origToNew = angle.first;
// Which neighbor am I to the burnt cell
int newToOrig = (origToNew + 180) % 360;
int adjCellNum = angle.second; // Check
auto adjIt = Cells_Obj.find(adjCellNum);
if (adjIt != Cells_Obj.end())
{
adjIt->second.ROSAngleDir.erase(newToOrig);
// cout << "from " << adjIt->second.realId << " erased " << it->second.realId <<
// endl;
}
}
}
}
}
Expand All @@ -1536,13 +1531,15 @@ Cell2Fire::GetMessages(const std::unordered_map<int, std::vector<int>>& sendMess
{
this->burningCells.insert(bc);
}

for (auto& bc : burningCells)
if (this->args_ptr->AllMessages)
{
auto lt = this->availCells.find(bc);
if (lt != this->availCells.end())
for (auto& bc : burningCells)
{
this->availCells.erase(bc);
auto lt = this->availCells.find(bc);
if (lt != this->availCells.end())
{
this->availCells.erase(bc);
}
}
}

Expand Down
Loading
Loading