Merge pull request qminer#3 from qminer/master

merge upstream
klemenkenda · Jul 31, 2018 · 291698a · 291698a
2 parents ca21594 + 406825d
commit 291698a
Show file tree

Hide file tree

Showing 91 changed files with 589 additions and 830 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,15 +11,14 @@ addons:
     packages: [ 'gcc-4.8', 'g++-4.8', 'gcc-4.8-multilib', 'g++-4.8-multilib', 'libc6-dev-i386', 'linux-libc-dev:i386' ]
 
 node_js:
-  - 6
-  - 8
+  - 10
 
 env:
   - CXXFLAGS=-std=c++0x CC=gcc-4.8 CXX=g++-4.8
 
 matrix:
   include:
-    - node_js: 4
+    - node_js: 6
       env: LLVM_VERSION=3.6.0 CXXFLAGS=-std=c++0x CXX=clang++ CC=clang NPMOPT=--clang=1 QMDEBUG=--debug
 
 cache:
@@ -56,8 +55,7 @@ script:
   - npm install -g mocha
   - npm install -g mustache
   - ./tools/genExampleTests.sh
-  - ./test/nodejs/test.sh
-  - ./test/cpp/test.sh
+  - npm test
 
 os: linux
 notifications:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # QMiner Change Log
 
+## 10 July 2018
+
+**Version 9.2.3**
+
+**Non-breaking with bug fixes**
+
+Bugfix:
+- Fixed GCC compile warnings
+- Fixed JSON escaping
+- Added Node.js 10 to CI
+- Fixed quantile CDF functions
+- Fixed standard deviation function (better handling of edge cases)
+- TMem got slimmer (16 bytes instead of 24 bytes!)
+- Fixed running of `npm test`
+
+
 ## 20 April 2018
 
 **Version 9.2.2**
@@ -13,6 +29,7 @@ Bugfix:
 - TMem got slimmer (24 bytes instead of 32 bytes!)
 - Fixed how exceptions are handled in `fs.readLines`
 
+
 ## 13 April 2018
 
 **Verstion 9.2.1**

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ hardware, providing efficient storage, retrieval and analytics mechanisms with r
 
 ### Prerequisites
 
-**node.js v8.x, v6.x, v4.x and npm 5.3 or higher**
+**node.js v 10.x, v8.x, v6.x and npm 5.3 or higher**
 
 To test that your node.js version is correct, run ```node --version``` and ```npm --version```. Not compatible with nodejs v0.10 or older.
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,7 +1,7 @@
 environment:
   matrix:
-  - nodejs_version: "4"
-  - nodejs_version: "9"
+  - nodejs_version: "8"
+  - nodejs_version: "10"
 
 platform:
   - x64
@@ -29,8 +29,7 @@ build_script:
   - cd tools
   - genExampleTests.bat
   - cd ..
-  - .\test\nodejs\test.bat
-
+  - npm test
 
 test: off
 deploy: off
diff --git a/nodedoc/analyticsdoc.js b/nodedoc/analyticsdoc.js
@@ -2545,8 +2545,8 @@
      * Provided a given value or array of values it returns the corresponding
      * values of the cumulative distribution function.
      *
-     * @param {number|Array} pVals - the p-values which we a querying
-     * @returns {number|Array} quantiles - depending whether the input was a single value or array the method returns a quantile or array of quantiles
+     * @param {number|Array} vals - the values which we a querying (quantiles)
+     * @returns {number|Array} pVals - depending whether the input was a single value or array the method returns a probability or array of probabilities
      *
      * @example
      * var qm = require('qminer');
@@ -2560,9 +2560,9 @@
      * gk.insert(3.0);
      * gk.insert(2.0);
      *
-     * console.log(gk.cdf(0.01));   // prints the CDF for x = 0.01
-     * console.log(gk.cdf(10));   // prints the CDF for x = 10
-     * console.log(gk.cdf(100));    // prints the CDF for x = 100
+     * console.log(gk.cdf(0));   // prints the CDF for x = 0
+     * console.log(gk.cdf(2));   // prints the CDF for x = 2
+     * console.log(gk.cdf(4));    // prints the CDF for x = 4
      */
  exports.Gk.prototype.cdf = function (x) { return 0; }
 /**

diff --git a/nodedoc/analyticsdoc.js.html b/nodedoc/analyticsdoc.js.html
@@ -2575,8 +2575,8 @@ <h1>Source: analyticsdoc.js</h1>
      * Provided a given value or array of values it returns the corresponding
      * values of the cumulative distribution function.
      *
-     * @param {number|Array} pVals - the p-values which we a querying
-     * @returns {number|Array} quantiles - depending whether the input was a single value or array the method returns a quantile or array of quantiles
+     * @param {number|Array} vals - the values which we a querying (quantiles)
+     * @returns {number|Array} pVals - depending whether the input was a single value or array the method returns a probability or array of probabilities
      *
      * @example
      * var qm = require(&#x27;qminer&#x27;);
@@ -2590,9 +2590,9 @@ <h1>Source: analyticsdoc.js</h1>
      * gk.insert(3.0);
      * gk.insert(2.0);
      *
-     * console.log(gk.cdf(0.01));   // prints the CDF for x = 0.01
-     * console.log(gk.cdf(10));   // prints the CDF for x = 10
-     * console.log(gk.cdf(100));    // prints the CDF for x = 100
+     * console.log(gk.cdf(0));   // prints the CDF for x = 0
+     * console.log(gk.cdf(2));   // prints the CDF for x = 2
+     * console.log(gk.cdf(4));    // prints the CDF for x = 4
      */
  exports.Gk.prototype.cdf = function (x) { return 0; }
 /**

diff --git a/nodedoc/index.html b/nodedoc/index.html
@@ -13,7 +13,7 @@
                 <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
         <div id="jsdoc-navbar-content">
-            <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+            <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
         </div>
     </div>
 </nav>
@@ -467,7 +467,7 @@ <h2 id="analytics.Gk">analytics.Gk</h2>
             <dd>
             </dd>
             <dt class="symbol-index-name">
-                <a href="module-analytics.Gk.html#cdf" class="!symbol-index-name">analytics.<wbr>Gk#<wbr>cdf(pVals)</a>
+                <a href="module-analytics.Gk.html#cdf" class="!symbol-index-name">analytics.<wbr>Gk#<wbr>cdf(vals)</a>
             </dt>
             <dd>
             </dd>

diff --git a/nodedoc/module-analytics-ActiveLearner.html b/nodedoc/module-analytics-ActiveLearner.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.ClassificationScore.html b/nodedoc/module-analytics-metrics.ClassificationScore.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.MeanAbsoluteError.html b/nodedoc/module-analytics-metrics.MeanAbsoluteError.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.MeanAbsolutePercentageError.html b/nodedoc/module-analytics-metrics.MeanAbsolutePercentageError.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.MeanError.html b/nodedoc/module-analytics-metrics.MeanError.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.MeanSquareError.html b/nodedoc/module-analytics-metrics.MeanSquareError.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.PredictionCurve.html b/nodedoc/module-analytics-metrics.PredictionCurve.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.R2Score.html b/nodedoc/module-analytics-metrics.R2Score.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.RootMeanSquareError.html b/nodedoc/module-analytics-metrics.RootMeanSquareError.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-metrics.html b/nodedoc/module-analytics-metrics.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-preprocessing.Binarizer.html b/nodedoc/module-analytics-preprocessing.Binarizer.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics-preprocessing.html b/nodedoc/module-analytics-preprocessing.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.BiasedGk.html b/nodedoc/module-analytics.BiasedGk.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.BufferedTDigest.html b/nodedoc/module-analytics.BufferedTDigest.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.DpMeans.html b/nodedoc/module-analytics.DpMeans.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.Gk.html b/nodedoc/module-analytics.Gk.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>
@@ -88,7 +88,7 @@ <h2 class="summary-callout-heading">Methods</h2>
                     <dt><a href="module-analytics.Gk.html#.save">save(fout)</a></dt>
                     <dd>
                     </dd>
-                    <dt><a href="module-analytics.Gk.html#cdf">cdf(pVals)</a></dt>
+                    <dt><a href="module-analytics.Gk.html#cdf">cdf(vals)</a></dt>
                     <dd>
                     </dd>
                   </dl>
@@ -382,7 +382,7 @@ <h4>Parameter</h4>
                   <p><code><a href="module-fs.FOut.html">module:fs.FOut</a></code>&nbsp;- the output stream</p>
                 </dd>
               </dl>
-              <h3 id="cdf"><span class="symbol-name">cdf</span><span class="signature"><span class="signature-params">(pVals)</span>&nbsp;&rarr; <span class="signature-returns"> (number or Array)</span></span></h3>
+              <h3 id="cdf"><span class="symbol-name">cdf</span><span class="signature"><span class="signature-params">(vals)</span>&nbsp;&rarr; <span class="signature-returns"> (number or Array)</span></span></h3>
               <p>Provided a given value or array of values it returns the corresponding values of the cumulative distribution function.</p>
               <section>
                 <h4>
@@ -400,9 +400,9 @@ <h4>
 gk.insert(3.0);
 gk.insert(2.0);
 
-console.log(gk.cdf(0.01));   // prints the CDF for x = 0.01
-console.log(gk.cdf(10));   // prints the CDF for x = 10
-console.log(gk.cdf(100));    // prints the CDF for x = 100</code></pre>
+console.log(gk.cdf(0));   // prints the CDF for x = 0
+console.log(gk.cdf(2));   // prints the CDF for x = 2
+console.log(gk.cdf(4));    // prints the CDF for x = 4</code></pre>
                 </div>
               </section>
               <section>
@@ -419,7 +419,7 @@ <h4>Parameter</h4>
                   <tbody>
                     <tr>
                       <td>
-                        <p>pVals</p>
+                        <p>vals</p>
                       </td>
                       <td>
                         <p>(number or Array)</p>
@@ -428,7 +428,7 @@ <h4>Parameter</h4>
                         <p>&nbsp;</p>
                       </td>
                       <td>
-                        <p>the p-values which we a querying</p>
+                        <p>the values which we a querying (quantiles)</p>
                       </td>
                     </tr>
                   </tbody>
@@ -437,7 +437,7 @@ <h4>Parameter</h4>
               <dl class="dl-compact">
                 <dt>Returns</dt>
                 <dd>
-                  <p><code>(number or Array)</code>&nbsp;quantiles - depending whether the input was a single value or array the method returns a quantile or array of quantiles</p>
+                  <p><code>(number or Array)</code>&nbsp;pVals - depending whether the input was a single value or array the method returns a probability or array of probabilities</p>
                 </dd>
               </dl>
               <h3 id="getParams"><span class="symbol-name">getParams</span><span class="signature"><span class="signature-params">()</span>&nbsp;&rarr; <span class="signature-returns"> module:analytics.quantiles~GkParam</span></span></h3>

diff --git a/nodedoc/module-analytics.KMeans.html b/nodedoc/module-analytics.KMeans.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.LogReg.html b/nodedoc/module-analytics.LogReg.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.MDS.html b/nodedoc/module-analytics.MDS.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.NNet.html b/nodedoc/module-analytics.NNet.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>

diff --git a/nodedoc/module-analytics.NearestNeighborAD.html b/nodedoc/module-analytics.NearestNeighborAD.html
@@ -15,7 +15,7 @@
   <nav id="jsdoc-navbar" role="navigation" class="jsdoc-navbar">
     <div id="jsdoc-navbar-container">
       <div id="jsdoc-navbar-content">
-        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.2</a>
+        <a href="index.html" class="jsdoc-navbar-package-name">QMiner JavaScript API v9.2.4</a>
       </div>
     </div>
   </nav>