Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
- `enumpoly` would take a very long time on some supports where an equilibrium is located on the
boundary of the projected game. Search is now restricted to the interior of the space ruling
these out; these will always be found by another projection. (#756)
- In the graphical interface, the logit correspondence display would fail and terminate the program
on very small (<10^{-300}) probabilities.

## [16.5.1] - unreleased

Expand Down
7 changes: 6 additions & 1 deletion src/gui/dlefglogit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,12 @@ void LogitBehavList::AddProfile(const wxString &p_text, bool p_forceShow)
}
m_lambdas.push_back(std::stod(next.ToStdString()));
for (size_t i = 1; i <= profile->BehaviorProfileLength(); i++) {
(*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
try {
(*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
}
catch (std::out_of_range &) {
(*profile)[i] = 0.0;
}
}
m_profiles.push_back(profile);
if (p_forceShow || m_profiles.size() - GetNumberRows() > 20) {
Expand Down
7 changes: 6 additions & 1 deletion src/gui/dlnfglogit.cc
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,12 @@ void LogitMixedBranch::AddProfile(const wxString &p_text)
m_lambdas.push_back(std::stod(next.ToStdString()));

for (size_t i = 1; i <= profile->MixedProfileLength(); i++) {
(*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
try {
(*profile)[i] = std::stod(tok.GetNextToken().ToStdString());
}
catch (std::out_of_range &) {
(*profile)[i] = 0.0;
}
}

m_profiles.push_back(profile);
Expand Down