Cleaver module updates

Author: allywarner

src/Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.cc

@@ -60,8 +60,8 @@ using namespace SCIRun::Core::Algorithms::Fields;
 using namespace SCIRun::Core::Geometry;
 
 ALGORITHM_PARAMETER_DEF(Fields, Verbose);
-ALGORITHM_PARAMETER_DEF(Fields, VolumeScaling);
-ALGORITHM_PARAMETER_DEF(Fields, VolumeMultiplier);
+ALGORITHM_PARAMETER_DEF(Fields, VolumeSamplingRate);
+ALGORITHM_PARAMETER_DEF(Fields, VolumeFeatureScaling);
 ALGORITHM_PARAMETER_DEF(Fields, Lipschitz);
 ALGORITHM_PARAMETER_DEF(Fields, Padding);
 ALGORITHM_PARAMETER_DEF(Fields, AlphaShort);
@@ -84,9 +84,9 @@ namespace detail
   static const double kDefaultAlpha = 0.4;
   static const double kDefaultAlphaLong = 0.357;
   static const double kDefaultAlphaShort = 0.203;
-  static const double kDefaultScale = 1.0;
+  static const double kDefaultSamplingRate = 1.0;
   static const double kDefaultLipschitz = 0.2;
-  static const double kDefaultMultiplier = 1.0;
+  static const double kDefaultFeatureScaling = 1.0;
   //static const int    kDefaultPadding = 0;
   //static const int    kDefaultMaxIterations = 1000;
   //static const double kDefaultSigma = 1.;
@@ -96,9 +96,9 @@ namespace detail
     cleaver2::MeshType mesh_mode;
     double alphaLong;
     double alphaShort;
-    double scaling;
+    double samplingRate;
     double lipschitz;
-    double multiplier;
+    double featureScaling;
     bool verbose;
     bool simpleMode;
     bool reverseJacobians;
@@ -119,9 +119,9 @@ namespace detail
     Cleaver2Impl(const AlgorithmBase* algo, const Cleaver2Parameters& params, FieldHandle sizingField, FieldHandle backgroundMesh) :
       algo_(algo), params_(params), inputSizingField_(sizingField), inputBackgroundMesh_(backgroundMesh)
     {
-      LOG_DEBUG("Cleaver 2 parameters: \n\tmesh_mode: {}\n\talphaLong: {}\n\talphaShort: {}\n\tscaling: {}\n\tlipschitz: {}\n\tmultiplier: {}\n\tverbose: {}\n\tsimpleMode: {}",
+      LOG_DEBUG("Cleaver 2 parameters: \n\tmesh_mode: {}\n\talphaLong: {}\n\talphaShort: {}\n\tsampling_rate: {}\n\tlipschitz: {}\n\tfeature_scaling: {}\n\tverbose: {}\n\tsimpleMode: {}",
         params_.mesh_mode, params_.alphaLong, params_.alphaShort,
-        params_.scaling, params_.lipschitz, params_.multiplier,
+        params_.samplingRate, params_.lipschitz, params_.featureScaling,
         params_.verbose, params_.simpleMode);
     }
 
@@ -429,8 +429,8 @@ namespace detail
         sizingField_.reset(cleaver2::SizingFieldCreator::createSizingFieldFromVolume(
           volume_.get(),
           (float)(1.0 / params_.lipschitz),
-          (float)params_.scaling,
-          (float)params_.multiplier,
+          (float)params_.samplingRate,
+          (float)params_.featureScaling,
           0, // padding--off
           (params_.mesh_mode != cleaver2::Regular),
           params_.verbose));
@@ -508,8 +508,8 @@ InterfaceWithCleaver2Algorithm::InterfaceWithCleaver2Algorithm()
   addParameter(Parameters::Verbose, true);
   addParameter(Parameters::SimpleMode, false);
   addParameter(Parameters::ReverseJacobians, true);
-  addParameter(Parameters::VolumeScaling, detail::kDefaultScale);
-  addParameter(Parameters::VolumeMultiplier, detail::kDefaultMultiplier);
+  addParameter(Parameters::VolumeSamplingRate, detail::kDefaultSamplingRate);
+  addParameter(Parameters::VolumeFeatureScaling, detail::kDefaultFeatureScaling);
   addParameter(Parameters::Lipschitz, detail::kDefaultLipschitz);
   //addParameter(Parameters::Padding, detail::kDefaultPadding);
   addParameter(Parameters::AlphaLong, detail::kDefaultAlphaLong);
@@ -540,9 +540,9 @@ AlgorithmOutput InterfaceWithCleaver2Algorithm::runImpl(const FieldList& input,
     cleaver2::MeshType(get(Parameters::MeshMode).toInt()),
     get(Parameters::AlphaLong).toDouble(),
     get(Parameters::AlphaShort).toDouble(),
-    get(Parameters::VolumeScaling).toDouble(),
+    get(Parameters::VolumeSamplingRate).toDouble(),
     get(Parameters::Lipschitz).toDouble(),
-    get(Parameters::VolumeMultiplier).toDouble(),
+    get(Parameters::VolumeFeatureScaling).toDouble(),
     get(Parameters::Verbose).toBool(),
     get(Parameters::SimpleMode).toBool(),
     get(Parameters::ReverseJacobians).toBool()

src/Core/Algorithms/Field/InterfaceWithCleaver2Algorithm.h

@@ -39,8 +39,8 @@ namespace Algorithms {
 namespace Fields {
 
   ALGORITHM_PARAMETER_DECL(Verbose);
-  ALGORITHM_PARAMETER_DECL(VolumeScaling);
-  ALGORITHM_PARAMETER_DECL(VolumeMultiplier);
+  ALGORITHM_PARAMETER_DECL(VolumeSamplingRate);
+  ALGORITHM_PARAMETER_DECL(VolumeFeatureScaling);
   ALGORITHM_PARAMETER_DECL(Lipschitz);
   ALGORITHM_PARAMETER_DECL(Padding);
   ALGORITHM_PARAMETER_DECL(AlphaLong);

src/Interface/Modules/Fields/InterfaceWithCleaver2.ui

@@ -59,12 +59,12 @@
    <item row="2" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
-      <string>Scaling</string>
+      <string>Sampling Rate</string>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QDoubleSpinBox" name="scalingDoubleSpinBox_">
+    <widget class="QDoubleSpinBox" name="samplingRateDoubleSpinBox_">
      <property name="minimumSize">
       <size>
        <width>125</width>
@@ -82,12 +82,12 @@
    <item row="3" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
-      <string>Multiplier</string>
+      <string>Feature Scaling</string>
      </property>
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="QDoubleSpinBox" name="multiplierDoubleSpinBox_">
+    <widget class="QDoubleSpinBox" name="featureScalingDoubleSpinBox_">
      <property name="minimumSize">
       <size>
        <width>125</width>

src/Interface/Modules/Fields/InterfaceWithCleaver2Dialog.cc

@@ -44,8 +44,8 @@ InterfaceWithCleaver2Dialog::InterfaceWithCleaver2Dialog(const std::string& name
 
   addDoubleSpinBoxManager(alphaLongDoubleSpinBox_, Parameters::AlphaLong);
   addDoubleSpinBoxManager(alphaShortDoubleSpinBox_, Parameters::AlphaShort);
-  addDoubleSpinBoxManager(multiplierDoubleSpinBox_, Parameters::VolumeMultiplier);
-  addDoubleSpinBoxManager(scalingDoubleSpinBox_, Parameters::VolumeScaling);
+  addDoubleSpinBoxManager(featureScalingDoubleSpinBox_, Parameters::VolumeFeatureScaling);
+  addDoubleSpinBoxManager(samplingRateDoubleSpinBox_, Parameters::VolumeSamplingRate);
   addDoubleSpinBoxManager(lipschitzDoubleSpinBox_, Parameters::Lipschitz);
   addCheckBoxManager(verboseCheckBox_, Parameters::Verbose);
   addCheckBoxManager(simpleModeCheckBox_, Parameters::SimpleMode);

src/Modules/Fields/InterfaceWithCleaver2.cc

@@ -59,8 +59,8 @@ void InterfaceWithCleaver2::setStateDefaults()
   setStateDoubleFromAlgo(Parameters::Lipschitz);
   setStateDoubleFromAlgo(Parameters::AlphaLong);
   setStateDoubleFromAlgo(Parameters::AlphaShort);
-  setStateDoubleFromAlgo(Parameters::VolumeScaling);
-  setStateDoubleFromAlgo(Parameters::VolumeMultiplier);
+  setStateDoubleFromAlgo(Parameters::VolumeSamplingRate);
+  setStateDoubleFromAlgo(Parameters::VolumeFeatureScaling);
   setStateIntFromAlgo(Parameters::MeshMode);
 }
 
@@ -78,8 +78,8 @@ void InterfaceWithCleaver2::execute()
     setAlgoDoubleFromState(Parameters::Lipschitz);
     setAlgoDoubleFromState(Parameters::AlphaLong);
     setAlgoDoubleFromState(Parameters::AlphaShort);
-    setAlgoDoubleFromState(Parameters::VolumeScaling);
-    setAlgoDoubleFromState(Parameters::VolumeMultiplier);
+    setAlgoDoubleFromState(Parameters::VolumeSamplingRate);
+    setAlgoDoubleFromState(Parameters::VolumeFeatureScaling);
     setAlgoIntFromState(Parameters::MeshMode);
 
     auto output = algo().run(withInputData((InputFields, fields)