Skip to content

Commit 5bbc6e1

Browse files
committed
- sqlmath - Update c-struct-field Doublewin.wnn as boolean indicating window-mode.
1 parent ba1f7a6 commit 5bbc6e1

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

sqlmath_base.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ typedef struct Doublewin {
314314
//
315315
double ncol; // number of columns
316316
double waa; // window-position-left
317-
double wnn; // number of window elements
317+
double wnn; // window-mode
318318
} Doublewin;
319319
SQLMATH_API void doublewinAggfree(
320320
Doublewin ** dblwinAgg
@@ -3050,7 +3050,7 @@ SQLMATH_FUNC static void sql3_win_avg1_inverse(
30503050
// dblwin - init
30513051
DOUBLEWIN_AGGREGATE_CONTEXT(0);
30523052
if (!dblwin->wnn) {
3053-
dblwin->wnn = dblwin->nbody;
3053+
dblwin->wnn = 1;
30543054
}
30553055
}
30563056

@@ -3262,7 +3262,7 @@ typedef struct AggStdev {
32623262
double mxx; // x-average
32633263
double nnn; // number of elements
32643264
double vxx; // x-variance.p
3265-
double wnn; // number of window elements
3265+
double wnn; // window-mode
32663266
double xx0; // x-trailing
32673267
} AggStdev;
32683268

@@ -3299,7 +3299,7 @@ SQLMATH_FUNC static void sql3_stdev_inverse(
32993299
SQLITE3_AGGREGATE_CONTEXT(AggStdev);
33003300
// agg - welford - increment agg->vxx
33013301
if (sqlite3_value_numeric_type(argv[0]) != SQLITE_NULL) {
3302-
agg->wnn = agg->nnn;
3302+
agg->wnn = 1;
33033303
agg->xx0 = sqlite3_value_double(argv[0]);
33043304
}
33053305
}
@@ -3537,7 +3537,7 @@ SQLMATH_FUNC static void sql3_win_ema1_inverse(
35373537
// dblwin - init
35383538
DOUBLEWIN_AGGREGATE_CONTEXT(0);
35393539
if (!dblwin->wnn) {
3540-
dblwin->wnn = dblwin->nbody;
3540+
dblwin->wnn = 1;
35413541
}
35423542
}
35433543

@@ -3671,7 +3671,7 @@ SQLMATH_FUNC static void sql3_win_quantile1_inverse(
36713671
// dblwin - init
36723672
DOUBLEWIN_AGGREGATE_CONTEXT(0);
36733673
if (!dblwin->wnn) {
3674-
dblwin->wnn = dblwin->nbody;
3674+
dblwin->wnn = 1;
36753675
}
36763676
// dblwin - inverse
36773677
const int ncol = argc / 2;
@@ -3821,7 +3821,7 @@ typedef struct WinSinefit {
38213821
double vyy; // y-variance.p
38223822
//
38233823
double wbb; // window-position-right
3824-
double wnn; // number of window elements
3824+
double wnn; // window-mode
38253825
//
38263826
double xx0; // x-trailing
38273827
double xx1; // x-current
@@ -3830,7 +3830,8 @@ typedef struct WinSinefit {
38303830
double yy1; // y-current
38313831
} WinSinefit;
38323832
static const int WIN_SINEFIT_N = sizeof(WinSinefit) / sizeof(double);
3833-
static const int WIN_SINEFIT_STEP = 3 + 2;
3833+
static const int WIN_SINEFIT_STEP = 3 + 0;
3834+
// static const int WIN_SINEFIT_STEP = 3 + 2;
38343835

38353836
static void winSinefitDft(
38363837
WinSinefit * wsf,
@@ -4148,7 +4149,7 @@ SQLMATH_FUNC static void sql3_win_sinefit2_inverse(
41484149
// dblwin - init
41494150
DOUBLEWIN_AGGREGATE_CONTEXT(0);
41504151
if (!dblwin->wnn) {
4151-
dblwin->wnn = dblwin->nbody;
4152+
dblwin->wnn = 1;
41524153
}
41534154
}
41544155

0 commit comments

Comments
 (0)