Merge branch 'rjdverse:develop' into develop

rjdverse · Oct 25, 2024 · 2c45e2e · 2c45e2e
2 parents a514887 + 64b79c3
commit 2c45e2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/inst/java/jdplus-toolkit-base-core-3.2.5-SNAPSHOT.jar b/inst/java/jdplus-toolkit-base-core-3.2.5-SNAPSHOT.jar
diff --git a/inst/proto/sa.proto b/inst/proto/sa.proto
@@ -18,13 +18,15 @@ enum ComponentType{
 }
 
 enum DecompositionMode {
-  UNKNOWN = 0;	
+  UNKNOWN = 0;
   /* Y = T + S + I) */
   ADDITIVE = 1;
   /* Y = T * S * I) */
   MULTIPLICATIVE = 2;
+  /* LOG(Y) = T + S + I */
+  LOGADDITIVE = 3;
   /* Y = T * (S + I - 1) */
-  PSEUDOADDITIVE = 3;
+  PSEUDOADDITIVE = 4;
 }
 
 message SaDecomposition{
@@ -103,4 +105,4 @@ message CombinedSeasonalityTest{
 	jd3.StatisticalTest kruskal_wallis = 2;
 	jd3.OneWayAnova stable_seasonality = 3;
 	jd3.OneWayAnova evolutive_seasonality = 4;
-}
+}