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

Adjusted decorr rate to match spec #746

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Adjusted decorr rate to match spec #746

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions six/projects/csm/source/SIXSensorModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ std::vector<double> SIXSensorModel::getCrossCovarianceMatrix(
const six::DateTime timeP2 =
comparisonSIXModel.getReferenceDateAndTimeImpl();
const double time =
1000.0 * (timeP1.getTimeInMillis() - timeP2.getTimeInMillis());
0.001 * (timeP1.getTimeInMillis() - timeP2.getTimeInMillis());
std::vector<size_t> m(numGroups);

for (size_t ii = 0; ii < numGroups; ++ii)
Expand Down Expand Up @@ -1119,13 +1119,13 @@ double SIXSensorModel::getCorrelationCoefficient(size_t cpGroupIndex,
{
const double coeff = errors.mPositionCorrCoefZero -
errors.mPositionDecorrRate * std::abs(deltaTime);
return std::min(1.0, std::max(-1.0, coeff));
return std::min(1.0, std::max(0.0, coeff));
}
case 1:
{
const double coeff = errors.mRangeCorrCoefZero -
errors.mRangeDecorrRate * std::abs(deltaTime);
return std::min(1.0, std::max(-1.0, coeff));
return std::min(1.0, std::max(0.0, coeff));
}
default:
throw csm::Error(csm::Error::INDEX_OUT_OF_RANGE,
Expand Down
Loading