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

COMP: Add missing semicolons to ITK macro calls #1227

Merged
merged 1 commit into from
Aug 30, 2024
Merged

COMP: Add missing semicolons to ITK macro calls #1227

Show file tree
Hide file tree
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
20 changes: 10 additions & 10 deletions Components/Optimizers/ConjugateGradient/itkGenericConjugateGradientOptimizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ class GenericConjugateGradientOptimizer : public ScaledSingleValuedNonLinearOpti
* GradientMagnitudeTolerance * \max(1, \|CurrentPosition\| ) \f$
*/
itkGetConstMacro(GradientMagnitudeTolerance, double);
itkSetMacro(GradientMagnitudeTolerance, double)

/** Setting: a stopping criterion, the value tolerance. By default 1e-5.
*
* The optimizer stops when
* \f[ 2.0 * | f_k - f_{k-1} | \le
* ValueTolerance * ( |f_k| + |f_{k-1}| + 1e-20 ) \f]
* is satisfied MaxNrOfItWithoutImprovement times in a row.
*/
itkGetConstMacro(ValueTolerance, double);
itkSetMacro(GradientMagnitudeTolerance, double);

/** Setting: a stopping criterion, the value tolerance. By default 1e-5.
*
* The optimizer stops when
* \f[ 2.0 * | f_k - f_{k-1} | \le
* ValueTolerance * ( |f_k| + |f_{k-1}| + 1e-20 ) \f]
* is satisfied MaxNrOfItWithoutImprovement times in a row.
*/
itkGetConstMacro(ValueTolerance, double);
Comment on lines -114 to +123
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Wildcarde FYI, I only just applied your patch, but then the automatic source code formatting (clang-format) also made some adjustments, as you see here!

itkSetMacro(ValueTolerance, double);

/** Setting: the maximum number of iterations in a row that
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/AdvancedAffineTransform/elxAdvancedAffineTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ AdvancedAffineTransformElastix<TElastix>::ReadFromFile()
if (itkFixedParameterValues == nullptr)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}
}

Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/AffineDTITransform/elxAffineDTITransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ AffineDTITransformElastix<TElastix>::ReadFromFile()
if (!pointRead)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}

/** Set the center in this Transform. */
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/AffineLogStackTransform/elxAffineLogStackTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ AffineLogStackTransform<TElastix>::ReadFromFile()
if (!pointRead)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}

this->InitializeAffineLogTransform();
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/BSplineStackTransform/elxBSplineStackTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ BSplineStackTransform<TElastix>::ReadFromFile()
{
itkExceptionMacro("NumberOfSubTransforms, StackOrigin, StackSpacing, GridSize, GridIndex, GridSpacing and "
"GridOrigin is required by "
<< this->GetNameOfClass() << ".")
<< this->GetNameOfClass() << ".");
}

/** Set it all. */
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/EulerStackTransform/elxEulerStackTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ EulerStackTransform<TElastix>::ReadFromFile()
if (!pointRead && !indexRead)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}

this->InitializeEulerTransform();
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/EulerTransform/elxEulerTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ EulerTransformElastix<TElastix>::ReadFromFile()
if (!pointRead)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}

/** Set the center in this Transform. */
Expand Down
2 changes: 1 addition & 1 deletion Components/Transforms/SimilarityTransform/elxSimilarityTransform.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ SimilarityTransformElastix<TElastix>::ReadFromFile()
if (!pointRead && !indexRead)
{
log::error("ERROR: No center of rotation is specified in the transform parameter file.");
itkExceptionMacro("Transform parameter file is corrupt.")
itkExceptionMacro("Transform parameter file is corrupt.");
}

/** Set the center in this Transform. */
Expand Down
2 changes: 1 addition & 1 deletion Core/Main/elxParameterObject.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ ParameterObject::ReadParameterFiles(const ParameterFileNameVectorType & paramete
{
if (!itksys::SystemTools::FileExists(parameterFileName))
{
itkExceptionMacro("Parameter file \"" << parameterFileName << "\" does not exist.")
itkExceptionMacro("Parameter file \"" << parameterFileName << "\" does not exist.");
}

this->AddParameterFile(parameterFileName);
Expand Down
4 changes: 2 additions & 2 deletions Core/Main/itkTransformixFilter.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ TransformixFilter<TImage>::GenerateData()
if (m_ComputeDeformationField && !m_FixedPointSetFileName.empty())
{
itkExceptionMacro("For backwards compatibility, only one of ComputeDeformationFieldOn() or "
"SetFixedPointSetFileName() can be active at any one time.")
"SetFixedPointSetFileName() can be active at any one time.");
}

// Setup argument map which transformix uses internally ito figure out what needs to be done
Expand Down Expand Up @@ -124,7 +124,7 @@ TransformixFilter<TImage>::GenerateData()

if (!m_OutputDirectory.empty() && !itksys::SystemTools::FileExists(m_OutputDirectory))
{
itkExceptionMacro("Output directory \"" << m_OutputDirectory << "\" does not exist.")
itkExceptionMacro("Output directory \"" << m_OutputDirectory << "\" does not exist.");
}

if (!m_OutputDirectory.empty())
Expand Down
Loading