sqlmath 2025.2.28__tar.gz → 2025.3.31__tar.gz

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/.ci.sh

@@ -87,6 +87,7 @@ process.stdout.write(
         # install graphicsmagick
         if (! command -v gm >/dev/null)
         then
+            sudo apt-get update
             sudo apt-get install -y graphicsmagick
         fi
         # mkdir .artifact/
@@ -513,16 +514,16 @@ shSqlmathUpdate() {(set -e
     if [ "$PWD/" = "$HOME/Documents/sqlmath/" ]
     then
         # shRollupFetch
-        if [ ! -d .sqlite-autoconf-3470200 ]
+        if [ ! -d .sqlite-autoconf-3490100 ]
         then
             for URL in \
 https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz \
-https://www.sqlite.org/2024/sqlite-autoconf-3470200.tar.gz
+https://www.sqlite.org/2025/sqlite-autoconf-3490100.tar.gz
             do
                 curl -L "$URL" | tar -xz
             done
             for DIR in \
-                sqlite-autoconf-3470200 \
+                sqlite-autoconf-3490100 \
                 zlib-1.3.1
             do
                 rm -rf ".$DIR"

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/CHANGELOG.md

@@ -1,9 +1,15 @@
 # Changelog
 
 # Todo
+- sqlmath - Re-introduce sliding-discrete-fourier-transform to improve initial guess in sql-function WIN_SINEFIT2().
 - sqlite - Add similar error-handling from builtin-sql-function PERCENTILE() into custom-sql-function QUANTILE().
 - none
 
+# v2025.3.31
+- ubuntu-ci - bugfix - Fix out-of-date apt-list when installing graphicsmagick.
+- sqlite - Upgrade to sqlite-v3.49.1.
+- Cleanup sql-functions ZLIB_COMPRESS(), ZLIB_UNCOMPRESS().
+
 # v2025.2.28
 - sqlmath - Update sql-function SHA256() to use tinycrypt.
 - jslint - Update shell-function shDirHttplinkValidate() with pragma <\!!--novalidate--\>.

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sqlmath
-Version: 2025.2.28
+Version: 2025.3.31
 Summary: sqlite for datascience
 Author: Kai Zhu
 Requires-Python: >=3.10
@@ -27,7 +27,7 @@ Description-Content-Type: text/markdown
 
 
 # Status
-| Branch | [master<br>(v2025.2.28)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
+| Branch | [master<br>(v2025.3.31)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
 |--:|:--:|:--:|:--:|
 | CI | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Amaster) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Abeta) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Aalpha) |
 | Coverage | [![coverage](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/index.html) |
@@ -146,11 +146,11 @@ PORT=8080 sh jslint_ci.sh shHttpFileServer
 ```shell
 python -m build
 #
-twine upload --repository testpypi dist/sqlmath-2025.2.28*
-py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2025.2.28
+twine upload --repository testpypi dist/sqlmath-2025.3.31*
+py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2025.3.31
 #
-twine upload dist/sqlmath-2025.2.28*
-pip install sqlmath==2025.2.28
+twine upload dist/sqlmath-2025.3.31*
+pip install sqlmath==2025.3.31
 ```
 
 
@@ -164,8 +164,8 @@ pip install sqlmath==2025.2.28
     sh jslint_ci.sh shRollupUpgrade "v4.4.0" "v4.5.0" ".ci.sh sqlmath_base.h"
     #
     # sqlite
-    sh jslint_ci.sh shRollupUpgrade "3.46.1" "3.47.2" ".ci.sh sqlmath_external_sqlite.c"
-    sh jslint_ci.sh shRollupUpgrade "3460100" "3470200" ".ci.sh sqlmath_external_sqlite.c"
+    sh jslint_ci.sh shRollupUpgrade "3.47.2" "3.49.1" ".ci.sh sqlmath_external_sqlite.c"
+    sh jslint_ci.sh shRollupUpgrade "3470200" "3490100" ".ci.sh sqlmath_external_sqlite.c"
     #
     # zlib
     # sh jslint_ci.sh shRollupUpgrade "1.3" "1.3.1" ".ci.sh sqlmath_external_zlib.c"

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/README.md

@@ -2,7 +2,7 @@
 
 
 # Status
-| Branch | [master<br>(v2025.2.28)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
+| Branch | [master<br>(v2025.3.31)](https://github.com/sqlmath/sqlmath/tree/master) | [beta<br>(Web Demo)](https://github.com/sqlmath/sqlmath/tree/beta) | [alpha<br>(Development)](https://github.com/sqlmath/sqlmath/tree/alpha) |
 |--:|:--:|:--:|:--:|
 | CI | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Amaster) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=beta)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Abeta) | [![ci](https://github.com/sqlmath/sqlmath/actions/workflows/ci.yml/badge.svg?branch=alpha)](https://github.com/sqlmath/sqlmath/actions?query=branch%3Aalpha) |
 | Coverage | [![coverage](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-master/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-beta/.artifact/coverage/index.html) | [![coverage](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/coverage_badge.svg)](https://sqlmath.github.io/sqlmath/branch-alpha/.artifact/coverage/index.html) |
@@ -121,11 +121,11 @@ PORT=8080 sh jslint_ci.sh shHttpFileServer
 ```shell
 python -m build
 #
-twine upload --repository testpypi dist/sqlmath-2025.2.28*
-py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2025.2.28
+twine upload --repository testpypi dist/sqlmath-2025.3.31*
+py -m pip install --index-url https://test.pypi.org/simple/ sqlmath==2025.3.31
 #
-twine upload dist/sqlmath-2025.2.28*
-pip install sqlmath==2025.2.28
+twine upload dist/sqlmath-2025.3.31*
+pip install sqlmath==2025.3.31
 ```
 
 
@@ -139,8 +139,8 @@ pip install sqlmath==2025.2.28
     sh jslint_ci.sh shRollupUpgrade "v4.4.0" "v4.5.0" ".ci.sh sqlmath_base.h"
     #
     # sqlite
-    sh jslint_ci.sh shRollupUpgrade "3.46.1" "3.47.2" ".ci.sh sqlmath_external_sqlite.c"
-    sh jslint_ci.sh shRollupUpgrade "3460100" "3470200" ".ci.sh sqlmath_external_sqlite.c"
+    sh jslint_ci.sh shRollupUpgrade "3.47.2" "3.49.1" ".ci.sh sqlmath_external_sqlite.c"
+    sh jslint_ci.sh shRollupUpgrade "3470200" "3490100" ".ci.sh sqlmath_external_sqlite.c"
     #
     # zlib
     # sh jslint_ci.sh shRollupUpgrade "1.3" "1.3.1" ".ci.sh sqlmath_external_zlib.c"

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/jslint.mjs

@@ -163,7 +163,7 @@ let jslint_charset_ascii = (
     + "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
     + "`abcdefghijklmnopqrstuvwxyz{|}~\u007f"
 );
-let jslint_edition = "v2024.12.1-beta";
+let jslint_edition = "v2025.3.1-beta";
 let jslint_export;                      // The jslint object to be exported.
 let jslint_fudge = 1;                   // Fudge starting line and starting
                                         // ... column to 1.

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/jslint_ci.sh

@@ -293,6 +293,7 @@ shCiArtifactUpload() {(set -e
     # install graphicsmagick
     if (! command -v gm >/dev/null)
     then
+        sudo apt-get update
         sudo apt-get install -y graphicsmagick
     fi
     # mkdir .artifact/

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/package.json

@@ -32,5 +32,5 @@
     },
     "shCiArtifactUpload": 1,
     "shCiPublishNpm": 1,
-    "version": "2025.2.28"
+    "version": "2025.3.31"
 }

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/pyproject.toml

@@ -9,7 +9,7 @@ backend-path = ["."]
 # https://peps.python.org/pep-0621/#example
 [project]
 name = "sqlmath"
-version = "2025.2.28"
+version = "2025.3.31"
 description = "sqlite for datascience"
 authors = [{name = "Kai Zhu"}]
 maintainers = []

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/setup.py

@@ -27,8 +27,8 @@ python setup.py bdist_wheel
 python setup.py build_ext
 """
 
-__version__ = "2025.2.28"
-__version_info__ = ("2025", "2", "28")
+__version__ = "2025.3.31"
+__version_info__ = ("2025", "3", "31")
 
 import asyncio
 import base64

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/sqlmath/__init__.py

@@ -21,8 +21,8 @@
 
 """sqlmath.py."""
 
-__version__ = "2025.2.28"
-__version_info__ = ("2025", "2", "28")
+__version__ = "2025.3.31"
+__version_info__ = ("2025", "3", "31")
 
 import json
 import math

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/sqlmath.mjs

@@ -122,7 +122,7 @@ let {
 let sqlMessageDict = {}; // dict of web-worker-callbacks
 let sqlMessageId = 0;
 let sqlWorker;
-let version = "v2025.2.28";
+let version = "v2025.3.31";
 
 async function assertErrorThrownAsync(asyncFunc, regexp) {
 

{sqlmath-2025.2.28 → sqlmath-2025.3.31}/sqlmath_base.c

@@ -314,7 +314,7 @@ typedef struct Doublewin {
     //
     double ncol;                // number of columns
     double waa;                 // window-position-left
-    double wnn;                 // number of window elements
+    double wnn;                 // window-mode
 } Doublewin;
 SQLMATH_API void doublewinAggfree(
     Doublewin ** dblwinAgg
@@ -2526,37 +2526,40 @@ SQLMATH_FUNC static void sql1_zlib_compress_func(
     sqlite3_value ** argv
 ) {
 // This function will compress <argv[0]> using zlib's compress() function,
-// with a 4-byte header storing original uncompressed size.
+// with a 4-byte header storing <original_size>.
     UNUSED_PARAMETER(argc);
-    // Extract the BLOB data and its size
-    const void *input_data = sqlite3_value_blob(argv[0]);
-    if (input_data == NULL) {
-        sqlite3_result_error(context, "Cannot compress() NULL blob", -1);
+    // init original_data
+    const void *original_data = sqlite3_value_blob(argv[0]);
+    if (original_data == NULL) {
+        sqlite3_result_error(context, "zlib_compress - cannot compress NULL",
+            -1);
         return;
     }
-    int input_size = sqlite3_value_bytes(argv[0]);
-    // Estimate the maximum size of the compressed data
-    uLongf output_size = compressBound(input_size);
-    // Allocate memory for the final result (header + compressed data)
-    unsigned char *result = (unsigned char *) sqlite3_malloc(4 + output_size);
-    if (result == NULL) {
+    // init original_size
+    int original_size = sqlite3_value_bytes(argv[0]);
+    // init compress_size
+    uLongf compress_size = compressBound(original_size);
+    // init compress_data
+    unsigned char *compress_data =
+        (unsigned char *) sqlite3_malloc(4 + compress_size);
+    if (compress_data == NULL) {
         sqlite3_result_error_nomem(context);
         return;
     }
-    // Perform the compression using zlib
-    int ret = compress(result + 4, &output_size, input_data, input_size);
-    if (ret != Z_OK) {
-        sqlite3_free(result);
-        sqlite3_result_error(context, "Compression failed", -1);
+    // zlib_compress
+    if (compress(compress_data + 4, &compress_size, original_data,
+            original_size) != Z_OK) {
+        sqlite3_free(compress_data);
+        sqlite3_result_error(context, "zlib_compress - failed compress", -1);
         return;
     }
-    // Set the 4-byte header with the original BLOB size (big-endian)
-    result[0] = (input_size >> 24) & 0xFF;
-    result[1] = (input_size >> 16) & 0xFF;
-    result[2] = (input_size >> 8) & 0xFF;
-    result[3] = input_size & 0xFF;
-    // Return the compressed result as a BLOB
-    sqlite3_result_blob(context, result, 4 + output_size, sqlite3_free);
+    // set 4-byte header storing <original_size> (big-endian)
+    compress_data[0] = (original_size >> 0x18) & 0xff;
+    compress_data[1] = (original_size >> 0x10) & 0xff;
+    compress_data[2] = (original_size >> 0x08) & 0xff;
+    compress_data[3] = (original_size >> 0x00) & 0xff;
+    sqlite3_result_blob(context, compress_data, 4 + compress_size,
+        sqlite3_free);
 }
 
 SQLMATH_FUNC static void sql1_zlib_uncompress_func(
@@ -2564,53 +2567,49 @@ SQLMATH_FUNC static void sql1_zlib_uncompress_func(
     int argc,
     sqlite3_value ** argv
 ) {
-// This function will uncompress <argv[0]> using zlib's uncompress() function,
-// and assumes input has a 4-byte header storing original uncompressed size.
+// This function will compress <argv[0]> using zlib's compress() function,
+// with a 4-byte header storing <original_size>.
     UNUSED_PARAMETER(argc);
-    // Extract the compressed BLOB data and its size
-    const unsigned char *input_data = sqlite3_value_blob(argv[0]);
-    if (input_data == NULL) {
-        sqlite3_result_error(context, "Cannot uncompress() NULL blob", -1);
+    // init compress_data
+    const unsigned char *compress_data = sqlite3_value_blob(argv[0]);
+    if (compress_data == NULL) {
+        sqlite3_result_error(context,
+            "zlib_uncompress - cannot uncompress NULL", -1);
         return;
     }
-    int input_size = sqlite3_value_bytes(argv[0]);
-    // Ensure the input BLOB is large enough to contain the 4-byte header
-    if (input_size < 4) {
-        sqlite3_result_error(context, "Invalid compressed BLOB, too small",
-            -1);
+    // init compress_size
+    int compress_size = sqlite3_value_bytes(argv[0]) - 4;
+    if (compress_size < 0) {
+        sqlite3_result_error(context, "zlib_uncompress - invalid header", -1);
         return;
     }
-    // Extract the original size from the 4-byte header (big-endian)
-    int original_size = (input_data[0] << 24) | (input_data[1] << 16) |
-        (input_data[2] << 8) | input_data[3];
-    // Ensure the original size is valid (greater than 0 and reasonable)
+    // init original_size
+    uLongf original_size = 0    //
+        | (compress_data[0] << 0x18)    //
+        | (compress_data[1] << 0x10)    //
+        | (compress_data[2] << 0x08)    //
+        | (compress_data[3] << 0x00);
     if (original_size <= 0 || original_size > SIZEOF_BLOB_MAX) {
-        sqlite3_result_error(context, "Invalid original size", -1);
+        sqlite3_result_error(context,
+            "zlib_uncompress - invalid original_size", -1);
         return;
     }
-    // The compressed data is everything after the 4-byte header
-    const void *compressed_data = input_data + 4;
-    int compressed_size = input_size - 4;
-    // Allocate memory for the decompressed data
-    unsigned char *decompressed_data =
+    // init original_data
+    unsigned char *original_data =
         (unsigned char *) sqlite3_malloc(original_size);
-    if (decompressed_data == NULL) {
+    if (original_data == NULL) {
         sqlite3_result_error_nomem(context);
         return;
     }
-    // Perform decompression using zlib
-    uLongf decompressed_size = original_size;
-    int ret =
-        uncompress(decompressed_data, &decompressed_size, compressed_data,
-        compressed_size);
-    if (ret != Z_OK) {
-        sqlite3_free(decompressed_data);
-        sqlite3_result_error(context, "Decompression failed", -1);
+    // zlib_uncompress
+    if (uncompress(original_data, &original_size, compress_data + 4,
+            compress_size) != Z_OK) {
+        sqlite3_free(original_data);
+        sqlite3_result_error(context, "zlib_uncompress - failed uncompress",
+            -1);
         return;
     }
-    // Return the decompressed data as a BLOB
-    sqlite3_result_blob(context, decompressed_data, decompressed_size,
-        sqlite3_free);
+    sqlite3_result_blob(context, original_data, original_size, sqlite3_free);
 }
 
 // SQLMATH_FUNC sql1_zlib_xxx_func - end
@@ -3051,7 +3050,7 @@ SQLMATH_FUNC static void sql3_win_avg1_inverse(
     // dblwin - init
     DOUBLEWIN_AGGREGATE_CONTEXT(0);
     if (!dblwin->wnn) {
-        dblwin->wnn = dblwin->nbody;
+        dblwin->wnn = 1;
     }
 }
 
@@ -3263,7 +3262,7 @@ typedef struct AggStdev {
     double mxx;                 // x-average
     double nnn;                 // number of elements
     double vxx;                 // x-variance.p
-    double wnn;                 // number of window elements
+    double wnn;                 // window-mode
     double xx0;                 // x-trailing
 } AggStdev;
 
@@ -3300,7 +3299,7 @@ SQLMATH_FUNC static void sql3_stdev_inverse(
     SQLITE3_AGGREGATE_CONTEXT(AggStdev);
     // agg - welford - increment agg->vxx
     if (sqlite3_value_numeric_type(argv[0]) != SQLITE_NULL) {
-        agg->wnn = agg->nnn;
+        agg->wnn = 1;
         agg->xx0 = sqlite3_value_double(argv[0]);
     }
 }
@@ -3538,7 +3537,7 @@ SQLMATH_FUNC static void sql3_win_ema1_inverse(
     // dblwin - init
     DOUBLEWIN_AGGREGATE_CONTEXT(0);
     if (!dblwin->wnn) {
-        dblwin->wnn = dblwin->nbody;
+        dblwin->wnn = 1;
     }
 }
 
@@ -3672,7 +3671,7 @@ SQLMATH_FUNC static void sql3_win_quantile1_inverse(
     // dblwin - init
     DOUBLEWIN_AGGREGATE_CONTEXT(0);
     if (!dblwin->wnn) {
-        dblwin->wnn = dblwin->nbody;
+        dblwin->wnn = 1;
     }
     // dblwin - inverse
     const int ncol = argc / 2;
@@ -3817,12 +3816,12 @@ typedef struct WinSinefit {
     double spp;                 // sine phase
     double sww;                 // sine angular-frequency
     //
-    double vxx;                 // y-variance.p
+    double vxx;                 // x-variance.p
     double vxy;                 // xy-covariance.p
     double vyy;                 // y-variance.p
     //
     double wbb;                 // window-position-right
-    double wnn;                 // number of window elements
+    double wnn;                 // window-mode
     //
     double xx0;                 // x-trailing
     double xx1;                 // x-current
@@ -3832,6 +3831,79 @@ typedef struct WinSinefit {
 } WinSinefit;
 static const int WIN_SINEFIT_N = sizeof(WinSinefit) / sizeof(double);
 static const int WIN_SINEFIT_STEP = 3 + 0;
+// static const int WIN_SINEFIT_STEP = 3 + 2;
+
+static void winSinefitDft(
+    WinSinefit * wsf,
+    double *xxyy,
+    const int wbb,
+    const int nbody,
+    const int ncol
+) {
+// This function will calculate running sliding-discrete-fourier-transform as:
+//     DFTn(tt+1) = (DFTn(tt) - dft(tt) + dft(tt+nnn)) * e
+    UNUSED_PARAMETER(wsf);
+    UNUSED_PARAMETER(xxyy);
+    UNUSED_PARAMETER(wbb);
+    UNUSED_PARAMETER(nbody);
+    UNUSED_PARAMETER(ncol);
+}
+
+static void winSinefitLnr(
+    WinSinefit * wsf,
+    double *xxyy,
+    const int wbb
+) {
+// This function will calculate running simple-linear-regression as:
+//     yy = laa + lbb*xx
+    const double invn0 = 1.0 / wsf->nnn;
+    const double xx = wsf->xx1;
+    const double yy = wsf->yy1;
+    double mxx = wsf->mxx;
+    double myy = wsf->myy;
+    double vxx = wsf->vxx;
+    double vxy = wsf->vxy;
+    double vyy = wsf->vyy;
+    if (wsf->wnn) {
+        // calculate running lnr - window
+        const double xx0 = wsf->xx0;
+        const double yy0 = wsf->yy0;
+        const double dx = xx - xx0;
+        const double dy = yy - yy0;
+        vxx += (xx * xx - xx0 * xx0) - dx * (dx * invn0 + 2 * mxx);
+        vyy += (yy * yy - yy0 * yy0) - dy * (dy * invn0 + 2 * myy);
+        vxy += (xx * yy - xx0 * yy0) - dx * myy - dy * (dx * invn0 + mxx);
+        mxx += dx * invn0;
+        myy += dy * invn0;
+    } else {
+        // calculate running lnr - welford
+        const double dx = xx - mxx;
+        const double dy = yy - myy;
+        // welford - increment vxx
+        mxx += dx * invn0;
+        vxx += dx * (xx - mxx);
+        // welford - increment vyy
+        myy += dy * invn0;
+        vyy += dy * (yy - myy);
+        // welford - increment vxy
+        vxy += dy * (xx - mxx);
+    }
+    // calculate lnr - laa, lbb
+    const double lbb = vxy / vxx;
+    const double laa = myy - lbb * mxx;
+    const double rr = yy - (laa + lbb * xx);
+    // wsf - save
+    wsf->laa = laa;
+    wsf->lbb = lbb;
+    wsf->mxx = mxx;
+    wsf->myy = myy;
+    wsf->rr1 = rr;
+    wsf->vxx = vxx;
+    wsf->vxy = vxy;
+    wsf->vyy = vyy;
+    // save rr1 in window
+    xxyy[wbb + 2] = isfinite(rr) ? rr : 0;
+}
 
 static void winSinefitSnr(
     WinSinefit * wsf,
@@ -3888,6 +3960,7 @@ static void winSinefitSnr(
             tmp = sww * xxyy[ii + 0];
             const double sxx = cos(tmp);
             const double syy = sin(tmp);
+            // Use de-trended residual.
             const double szz = inva * xxyy[ii + 2];
             sumxx += sxx * sxx;
             sumxy += sxx * syy;
@@ -4031,62 +4104,6 @@ static void winSinefitSnr(
     wsf->sww = sww;
 }
 
-static void winSinefitLnr(
-    WinSinefit * wsf,
-    double *xxyy,
-    const int wbb
-) {
-// This function will calculate running simple-linear-regression as:
-//     yy = laa + lbb*xx
-    const double invn0 = 1.0 / wsf->nnn;
-    const double xx = wsf->xx1;
-    const double yy = wsf->yy1;
-    double mxx = wsf->mxx;
-    double myy = wsf->myy;
-    double vxx = wsf->vxx;
-    double vxy = wsf->vxy;
-    double vyy = wsf->vyy;
-    if (wsf->wnn) {
-        // calculate running lnr - window
-        const double xx0 = wsf->xx0;
-        const double yy0 = wsf->yy0;
-        const double dx = xx - xx0;
-        const double dy = yy - yy0;
-        vxx += (xx * xx - xx0 * xx0) - dx * (dx * invn0 + 2 * mxx);
-        vyy += (yy * yy - yy0 * yy0) - dy * (dy * invn0 + 2 * myy);
-        vxy += (xx * yy - xx0 * yy0) - dx * myy - dy * (dx * invn0 + mxx);
-        mxx += dx * invn0;
-        myy += dy * invn0;
-    } else {
-        // calculate running lnr - welford
-        const double dx = xx - mxx;
-        const double dy = yy - myy;
-        // welford - increment vxx
-        mxx += dx * invn0;
-        vxx += dx * (xx - mxx);
-        // welford - increment vyy
-        myy += dy * invn0;
-        vyy += dy * (yy - myy);
-        // welford - increment vxy
-        vxy += dy * (xx - mxx);
-    }
-    // calculate lnr - laa, lbb
-    const double lbb = vxy / vxx;
-    const double laa = myy - lbb * mxx;
-    const double rr = yy - (laa + lbb * xx);
-    // wsf - save
-    wsf->laa = laa;
-    wsf->lbb = lbb;
-    wsf->mxx = mxx;
-    wsf->myy = myy;
-    wsf->rr1 = rr;
-    wsf->vxx = vxx;
-    wsf->vxy = vxy;
-    wsf->vyy = vyy;
-    // save rr1 in window
-    xxyy[wbb + 2] = isfinite(rr) ? rr : 0;
-}
-
 SQLMATH_FUNC static void sql3_win_sinefit2_value(
     sqlite3_context * context
 ) {
@@ -4132,7 +4149,7 @@ SQLMATH_FUNC static void sql3_win_sinefit2_inverse(
     // dblwin - init
     DOUBLEWIN_AGGREGATE_CONTEXT(0);
     if (!dblwin->wnn) {
-        dblwin->wnn = dblwin->nbody;
+        dblwin->wnn = 1;
     }
 }
 
@@ -4200,6 +4217,8 @@ static void sql3_win_sinefit2_step(
         winSinefitLnr(wsf, xxyy, wbb);
         // dblwin - calculate snr
         if (modeSnr) {
+            winSinefitDft(wsf, xxyy, wbb, (int) dblwin->nbody,
+                (int) dblwin->ncol);
             winSinefitSnr(wsf, xxyy, wbb, (int) dblwin->nbody,
                 (int) dblwin->ncol);
         }
@@ -4424,6 +4443,7 @@ SQLMATH_FUNC static void sql1_sinefit_refitlast_func(
         // dblwin - calculate lnr
         winSinefitLnr(wsf, xxyy, wbb);
         // dblwin - calculate snr
+        winSinefitDft(wsf, xxyy, wbb, nbody, ncol);
         winSinefitSnr(wsf, xxyy, wbb, nbody, ncol);
         // increment counter
         argv += 2;