rolled back mess

docs/cookbooks/CookBooksPanels.rst

@@ -15,7 +15,6 @@ Cook Books
    DataRegularisation
    OutlierDetection
    ResidualOutlierDetection
-   DriftDetection
    MultivariateFlagging
    ../documentation/GenericFunctions
 
@@ -64,16 +63,6 @@ Cook Books
       +++
       *Wrap your custom logical and arithmetic expressions with the generic functions*
 
-
-   .. grid-item-card:: Drift Detection
-      :link: DriftDetection
-      :link-type: doc
-
-      * define metrics to measure distance between data series
-      * automatically determine majority and anomalous data groups
-      +++
-      *Detecting datachunks drifting apart from a reference group*
-
    .. grid-item-card:: Modelling, Residuals and Arithmetics
       :link: ResidualOutlierDetection
       :link-type: doc

docs/misc/title.rst

@@ -62,7 +62,6 @@ Documentation
 
       * outlier detection
       * frequency alignment
-      * drift detection
       * data modelling
       * wrapping generic or custom functionality
       +++

docs/resources/data/hydro_config.csv

@@ -11,11 +11,11 @@ sac254_raw              ; align(freq='15min')
 # Drift Correcture
 sac254_raw              ; correctDrift(target='sac254_corr', maintenance_field='maint', model='exponential')
 # Multivariate Flagging Procedure
-level_z                 ; transform(field=['level_raw'], func=zScore(x), window='20D')
-water_z                 ; transform(field=['water_temp_raw'], func=zScore(x), window='20D')
-sac_z                   ; transform(field=['sac254_raw'], func=zScore(x), window='20D')
-kNN_scores              ; assignKNNScore(field=['level_z', 'water_z', 'sac_z'], window='20D')
-kNN_scores              ; flagByStray(window='20D')
+level_z                 ; transform(field=['level_raw'], func=zScore(x), freq='20D')
+water_z                 ; transform(field=['water_temp_raw'], func=zScore(x), freq='20D')
+sac_z                   ; transform(field=['sac254_raw'], func=zScore(x), freq='20D')
+kNN_scores              ; assignKNNScore(field=['level_z', 'water_z', 'sac_z'], freq='20D')
+kNN_scores              ; flagByStray(freq='20D')
 level_raw               ; concatFlags(field=['kNN_scores'], label='STRAY')
 sac254_corr             ; concatFlags(field=['kNN_scores'], label='STRAY')
 water_temp_raw          ; concatFlags(field=['kNN_scores'], label='STRAY')

docs/resources/data/myconfig4.csv

@@ -2,13 +2,8 @@ varname;test
 #------;--------------------------
 SM1;flagRange(min=10, max=60)
 SM2;flagRange(min=10, max=60)
-<<<<<<< HEAD
 SM1;flagMAD(window="15d", z=3.5)
 SM2;flagMAD(window="30d", z=3.5)
-=======
-SM1;flagMAD(freq="15d", z=3.5)
-SM2;flagMAD(freq="30d", z=3.5)
->>>>>>> parent of 30eb9fe1... mc solved
 SM1;plot(path='../resources/temp/SM1processingResults')
 SM2;plot(path='../resources/temp/SM2processingResults')