Create modules to avoid global scope pollution

Author: lauerfab

lalolab/.gitignore

@@ -6,6 +6,9 @@ lalohelp.js
 plotlib.js
 !src/plotlib.js
 
+*-module.js
+*.min.js
+
 # Excludes examples
 examples/
 

lalolab/Makefile

@@ -1,4 +1,4 @@
-all: src/glpk.min.js jszip.min.js lalolib.js ml.js laloliblab.js lalohelp.js plotlib.js 
+all: src/glpk.min.js jszip.min.js lalolib.js ml.js laloliblab.js lalohelp.js plotlib.js
 
 # Dependencies: GLPK.js and JSZIP.js
 src/glpk.min.js: 
@@ -21,17 +21,17 @@ jszip.min.js:
 
 # We do not include toolboxes in lalolib.js: explicitly load them with <script...> in the html file
 # This avoids loading a large file with toolboxes that are not used.
-lalolib.js: src/lalolibbase.js src/linalg.js src/sparse.js src/laloglpk.js src/glpk.min.js src/stats.js src/complex.js src/laloplots.js 
-	cat src/lalolibbase.js src/linalg.js src/sparse.js src/laloglpk.js src/glpk.min.js src/stats.js src/complex.js src/laloplots.js > lalolib.js 
+lalolib.js: src/lalolibbase.js src/linalg.js src/sparse.js src/laloglpk.js src/optim.js src/glpk.min.js src/stats.js src/complex.js src/laloplots.js 
+	cat src/lalolibbase.js src/linalg.js src/sparse.js src/laloglpk.js src/optim.js src/glpk.min.js src/stats.js src/complex.js src/laloplots.js > lalolib.js 
 
 # ML.js includes LALOLib plus Machine learning functions
 ml.js: lalolib.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/Loaders.js src/MLutils.js
 	cat lalolib.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/Loaders.js src/MLutils.js > ml.js
 
 # version for LALOLab (different printing functions...)
 # All toolboxes are included in LALOLab by default
-laloliblab.js: src/linalg.js src/sparse.js src/laloglpk.js src/stats.js src/glpk.min.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/GraphicalModel.js src/Loaders.js src/MLutils.js toolboxes
-	cat src/linalg.js src/sparse.js src/laloglpk.js src/glpk.min.js src/stats.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/GraphicalModel.js src/Loaders.js src/MLutils.js toolboxes/*.js > laloliblab.js
+laloliblab.js: src/linalg.js src/sparse.js src/laloglpk.js src/optim.js src/stats.js src/glpk.min.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/GraphicalModel.js src/Loaders.js src/MLutils.js toolboxes
+	cat src/linalg.js src/sparse.js src/laloglpk.js src/optim.js src/glpk.min.js src/stats.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/GraphicalModel.js src/Loaders.js src/MLutils.js toolboxes/*.js > laloliblab.js
 	echo "const I = Complex_I;" >> laloliblab.js
 
 # Online Help 
@@ -42,3 +42,30 @@ lalohelp.js: src/lalohelpbase.js help/*
 plotlib.js: src/plotlib.js
 	cp src/plotlib.js ./
 
+# modules
+modules: lalolib-module.js mljs-module.js lalolib-noglpk-module.js mljs-noglpk-module.js
+
+lalolib-module.js: src/modules/lalolib-moduleHeader.js lalolib.js src/modules/lalolib-moduleFooter.js 
+	cat src/modules/lalolib-moduleHeader.js lalolib.js src/modules/lalolib-moduleFooter.js > lalolib-module.js
+	
+	
+mljs-module.js: src/modules/mljs-moduleHeader.js ml.js src/modules/mljs-moduleFooter.js 
+	cat src/modules/mljs-moduleHeader.js ml.js src/modules/mljs-moduleFooter.js > mljs-module.js
+
+lalolib-noglpk-module.js: src/modules/lalolib-moduleHeader.js src/modules/lalolib-noglpk-moduleFooter.js src/lalolibbase.js src/linalg.js src/sparse.js src/optim.js src/stats.js src/complex.js 
+	cat src/modules/lalolib-moduleHeader.js src/lalolibbase.js src/linalg.js src/sparse.js src/optim.js src/stats.js src/complex.js src/modules/lalolib-noglpk-moduleFooter.js > lalolib-noglpk-module.js
+	
+mljs-noglpk-module.js: src/modules/mljs-moduleHeader.js src/modules/mljs-noglpk-moduleFooter.js src/lalolibbase.js src/linalg.js src/sparse.js src/optim.js src/stats.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/Loaders.js src/MLutils.js
+	cat src/modules/mljs-moduleHeader.js src/lalolibbase.js src/linalg.js src/sparse.js src/optim.js src/stats.js src/complex.js src/kernels.js src/Classifier.js src/Regression.js src/Clustering.js src/DimReduction.js src/Loaders.js src/MLutils.js src/modules/mljs-noglpk-moduleFooter.js > mljs-noglpk-module.js
+	
+# minification (requires minify installed via npm)
+minify: modules
+	minify lalolib.js
+	minify ml.js
+	minify lalolib-module.js
+	minify mljs-module.js
+	minify lalolib-noglpk-module.js
+	minify mljs-noglpk-module.js
+	
+
+	

lalolab/lalolib.html

@@ -137,7 +137,19 @@ <h1><strong>LALOLib / ML.js</strong>: <span style="font-size:90%;">scientific co
 </pre>
 for ML.js.
 </p>
-<p> Alternatively, you can use a local copy of the library (download <a href="lalolib.zip" download>lalolib</a> or <a href="ml.zip" download>ml.js</a>) and modify the path accordingly. 
+<p> Alternatively, you can 
+<ul>
+	<li>use a local copy of the library (download <a href="../package/lalolib.zip" download>lalolib</a> or <a href="../package/ml.zip" download>ml.js</a> and modify the path accordingly in the <i>script</i> tag above);</li>
+	<li>use a <i>module</i> with <pre>&lt;script src="http://mlweb.loria.fr/module-name.js"&gt;&lt;/script&gt;</pre> from the following list and prefix all functions accordingly (e.g., use <tt>mljs.solve(A,b)</tt> instead of <tt>solve(A,b)</tt>):
+	<table cellpadding="5px">
+	<tr><th>Module name</th><th>Contents</th><th>prefix</th><th>size</th></tr>
+	<tr><td><a href="../lalolib-module.min.js">lalolib-module.min.js</a></td><td>LALOLib (without plots)</td><td><tt>lalolib.</tt></td><td>446 KB</td></tr>
+	<tr><td><a href="../mljs-module.min.js">mljs-module.min.js</a></td><td>ML.js (without plots)</td><td><tt>mljs.</tt></td><td>552 KB</td></tr>
+	<tr><td><a href="../lalolib-noglpk-module.min.js">lalolib-noglpk-module.min.js</a></td><td>LALOLib (without plots, lp, qp, minl0, minl1)</td><td><tt>lalolib.</tt></td><td>147 KB</td></tr>
+	<tr><td><a href="../mljs-noglpk-module.min.js">mljs-noglpk-module.min.js</a></td><td>ML.js (without plots, lp, qp, minl0, minl1) </td><td><tt>mljs.</tt></td><td>253 KB</td></tr>
+	</table>
+	</li>
+</ul>
 <!--<pre>
 	&lt;script src="lalolib.js"&gt;&lt;/script&gt;
 </pre>
@@ -508,7 +520,7 @@ <h2 id="ml">Using the machine learning functions (ML.js)</h2>
 <h2 id="apiref">Available functions / API reference</h2>
 
 <p>
-Below is the list of functions provided by LALOLib. The help shows both the script-like LALOLab syntax and the corresponding javascript calls. Examples are mostly written for <a href="index.html">LALOLab</a> and should be executed by a <a href="#safer">lab.do() statement</a> in a javascript context. 
+Below is the list of functions provided by LALOLib. The help shows both the script-like LALOLab syntax and the corresponding javascript calls. Remember that when using a module version of the library, the functions must be prefixed accordingly. Examples are mostly written for <a href="index.html">LALOLab</a> and should be executed by a <a href="#safer">lab.do() statement</a> in a javascript context. 
 </p>
 
 <div class="container">