[Pkg-javascript-commits] [science.js] 68/87: Merge remote-tracking branch 'kitmonisit/node-dev'

[bhuvan krishna]

This is an automated email from the git hooks/post-receive script.

bhuvan-guest pushed a commit to branch master
in repository science.js.

commit 3e47bd28bab88e2ed3c7e184b0543ea930d42e8a
Merge: ae68141 f39007b
Author: Jason Davies <jason at jasondavies.com>
Date:   Thu Apr 19 22:42:18 2012 +0100

    Merge remote-tracking branch 'kitmonisit/node-dev'

 Makefile          |  9 +++++----
 science.v1.js     | 11 +++++++++--
 science.v1.min.js |  2 +-
 src/core/core.js  |  2 +-
 src/end.js        |  1 -
 src/start.js      |  1 -
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --cc Makefile
index bbdfb58,6cc56d6..0527247
--- a/Makefile
+++ b/Makefile
@@@ -1,18 -1,21 +1,17 @@@
 -JS_COMPILER = ./node_modules/uglify-js/bin/uglifyjs
 -JS_TESTER = ./node_modules/vows/bin/vows
 +NODE_PATH ?= ./node_modules
 +JS_COMPILER = $(NODE_PATH)/uglify-js/bin/uglifyjs
 +JS_TESTER = $(NODE_PATH)/vows/bin/vows
  
  all: \
 -	science.js \
 -	science.min.js \
 -	science.lin.js \
 -	science.lin.min.js \
 -	science.stats.js \
 -	science.stats.min.js \
 +	science.v1.js \
 +	science.v1.min.js \
  	package.json
  
 -.INTERMEDIATE science.js: \
 -	src/start.js \
 +.INTERMEDIATE science.v1.js: \
- 	src/start.js \
  	science.core.js \
  	science.lin.js \
  	science.stats.js \
--	src/end.js
++	Makefile
  
  science.core.js: \
  	src/core/core.js \
@@@ -65,10 -68,8 +64,12 @@@ test: al
  	@rm -f $@
  	$(JS_COMPILER) < $< > $@
  
- science%.js: Makefile
 -package.json: science.js src/package.js
 -	node src/package.js > $@
++%.js:
 +	@rm -f $@
- 	cat $(filter %.js,$^) > $@
++	@echo '(function(exports){' > $@
++	cat $(filter %.js,$^) >> $@
++	@echo '})(this);' >> $@
 +	@chmod a-w $@
  
  install:
  	mkdir -p node_modules
diff --cc science.v1.js
index 97c864b,81dda5b..eaeea98
--- a/science.v1.js
+++ b/science.v1.js
@@@ -1,4 -1,6 +1,6 @@@
- (function(){science = {version: "1.9.0"}; // semver
+ (function(exports){
 -science = {version: "1.8.0"}; // semver
 -exports.science = science;
++(function(exports){
++var science = exports.science = {version: "1.9.0"}; // semver
  science.ascending = function(a, b) {
    return a - b;
  };
@@@ -69,6 -71,6 +71,8 @@@ science.zeroes = function(n) 
          this, Array.prototype.slice.call(arguments, 1));
    return a;
  };
++})(this);
++(function(exports){
  science.lin = {};
  science.lin.decompose = function() {
  
@@@ -956,6 -958,6 +960,8 @@@ science.lin.tridag = function(a, b, c, 
      x[i] = (d[i] - c[i] * x[i + 1]) / b[i];
    }
  };
++})(this);
++(function(exports){
  science.stats = {};
  // Bandwidth selectors for Gaussian kernels.
  // Based on R's implementations in `stats.bw`.
@@@ -1732,4 -1734,4 +1738,5 @@@ science.stats.distribution.gaussian = f
  };
  
  science_stats_distribution_gaussianConstant = 1 / Math.sqrt(2 * Math.PI);
- })();
+ })(this);
++})(this);
diff --cc science.v1.min.js
index 27d4624,0000000..a204cb0
mode 100644,000000..100644
--- a/science.v1.min.js
+++ b/science.v1.min.js
@@@ -1,1 -1,0 +1,1 @@@
- (function(){function a(a,b,c){var d=c.length;for(var e=0;e<d;e++)a[e]=c[d-1][e];for(var f=d-1;f>0;f--){var g=0,h=0;for(var i=0;i<f;i++)g+=Math.abs(a[i]);if(g===0){b[f]=a[f-1];for(var e=0;e<f;e++)a[e]=c[f-1][e],c[f][e]=0,c[e][f]=0}else{for(var i=0;i<f;i++)a[i]/=g,h+=a[i]*a[i];var j=a[f-1],k=Math.sqrt(h);j>0&&(k=-k),b[f]=g*k,h-=j*k,a[f-1]=j-k;for(var e=0;e<f;e++)b[e]=0;for(var e=0;e<f;e++){j=a[e],c[e][f]=j,k=b[e]+c[e][e]*j;for(var i=e+1;i<=f-1;i++)k+=c[i][e]*a[i],b[i]+=c[i][e]*j;b[e]=k}j= [...]
++(function(a){(function(a){var b=a.science={version:"1.9.0"};b.ascending=function(a,b){return a-b},b.EULER=.5772156649015329,b.expm1=function(a){return a<1e-5&&a>-0.00001?a+.5*a*a:Math.exp(a)-1},b.functor=function(a){return typeof a=="function"?a:function(){return a}},b.hypot=function(a,b){a=Math.abs(a),b=Math.abs(b);var c,d;a>b?(c=a,d=b):(c=b,d=a);var e=d/c;return c*Math.sqrt(1+e*e)},b.quadratic=function(){function b(b,c,d){var e=c*c-4*b*d;return e>0?(e=Math.sqrt(e)/(2*b),a?[{r:-c-e,i:0 [...]
diff --cc src/core/core.js
index 7bc07e0,cd54726..21d3dc0
--- a/src/core/core.js
+++ b/src/core/core.js
@@@ -1,1 -1,2 +1,1 @@@
- science = {version: "1.9.0"}; // semver
 -science = {version: "1.8.0"}; // semver
 -exports.science = science;
++var science = exports.science = {version: "1.9.0"}; // semver
diff --cc src/end.js
index 0319a0f,9fda258..0000000
deleted file mode 100644,100644
--- a/src/end.js
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- })();
 -})(this);
diff --cc src/start.js
index 2f4bb35,d43e599..0000000
deleted file mode 100644,100644
--- a/src/start.js
+++ /dev/null
@@@ -1,1 -1,1 +1,0 @@@
- (function(){
 -(function(exports){

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/science.js.git