Merge remote-tracking branch 'ttk-dani/stochastic-discrete-gradient' into stochastic-discrete-gradient

Author: thom-dani

paraview/xmls/MorseSmaleComplex.xml

@@ -147,23 +147,24 @@
 
       <IntVectorProperty
       name="DiscreteGradientBackend"
-      label="DiscreteGradientBackend"
+      label="Discrete Gradient Backend"
       command="SetDiscreteGradientBackend"
         number_of_elements="1"
+        panel_visibility='advanced'
         default_values="0"
         >
         <EnumerationDomain name="enum">
-          <Entry value="0" text="Robins Discrete Gradient"/>
-          <Entry value="1" text="Stochastic Discrete Gradient"/>
+          <Entry value="0" text="Homotopic expansion algorithm (IEEE PAMI 2011)"/>
+          <Entry value="1" text="Stochastic algorithm (IEEE TVCG 2012)"/>
         </EnumerationDomain>                      
         <Documentation>
-          Method to compute discrete gradient field (first step in Morse smale complex computation).
+          Method to compute the discrete gradient field (first step in Morse-Smale complex computation).
         </Documentation>
       </IntVectorProperty>
 
 
       <IntVectorProperty name='StochasticGradientSeed'
-                   label='Seed For Random Device In Stochastic Gradient'
+                   label='Random seed (stochastic gradient)'
                    command='SetStochasticGradientSeed'
                    number_of_elements='1'
                    default_values='0'
@@ -176,7 +177,7 @@
                              value='1' />
       </Hints>
       <Documentation>
-        The seed for the random device used to shuffle critical points ids.
+        The seed for the random generator used by the stochastic backend.
       </Documentation>
       </IntVectorProperty>
 
@@ -362,6 +363,8 @@
         <Property name="Scalar Field" />
         <Property name="ForceInputOffsetScalarField"/>
         <Property name="Offset Field"/>
+        <Property name="DiscreteGradientBackend"/>
+        <Property name="StochasticGradientSeed"/>
       </PropertyGroup>
 
       <PropertyGroup panel_widget="Line" label="Output options">