Merge pull request #60 from sebpiq/develop

fixed npm install, changed src to lib

.npmignore

@@ -2,7 +2,6 @@ coverage
 img
 misc
 node_modules
-src
 test
 tools
 component.json

Jakefile.js

@@ -9,7 +9,7 @@ var jake = require('jake'),
 /**
  * Constants
  */
-var HEADER      = './src/header.js';
+var HEADER      = './lib/header.js';
 var DIST        = './dist';
 var MATHJS      = DIST + '/math.js';
 var MATHJS_MIN  = DIST + '/math.min.js';
@@ -38,7 +38,7 @@ task('bundle', {async: true}, function () {
   // make directory dist
   jake.mkdirP(DIST);
 
-  b.add('./src/index.js');
+  b.add('./lib/index.js');
   b.bundle({
     standalone: 'math'
   }, function (err, code) {
@@ -47,7 +47,7 @@ task('bundle', {async: true}, function () {
     }
 
     // add header and shim
-    var lib = util.read('./src/header.js') + code + util.read('./src/shim.js');
+    var lib = util.read('./lib/header.js') + code + util.read('./lib/shim.js');
 
     // write bundled file
     util.write(MATHJS, lib);

README.md

@@ -732,7 +732,7 @@ There are a few preferences regarding code contributions:
 - Math.js follows the node.js code style as described
   [here](http://nodeguide.com/style.html).
 - Send pull requests to the `develop` branch, not the `master` branch.
-- Only commit changes done in the source files under `src`, not to the library
+- Only commit changes done in the source files under `lib`, not to the builds, which are under `dist`.
   builds `math.js` and `math.min.js`.
 
 Thanks!

bower.json

@@ -7,7 +7,7 @@
     "img",
     "misc",
     "node_modules",
-    "src",
+    "lib",
     "test",
     "tools",
     ".gitignore",

examples/basic_usage.js

@@ -1,7 +1,7 @@
 // basic usage
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/chained_operations.js

@@ -1,7 +1,7 @@
 // chained operations
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/complex_numbers.js

@@ -1,7 +1,7 @@
 // complex numbers
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/expressions.js

@@ -8,7 +8,7 @@
  */
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/import.js

@@ -4,7 +4,7 @@
  * with functions and variables.
  */
 
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/matrices.js

@@ -1,7 +1,7 @@
 // matrices
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

examples/units.js

@@ -1,7 +1,7 @@
 // units
 
 // load math.js
-var math = require('../dist/math.js');
+var math = require('../index');
 
 /**
  * Helper function to output a value in the console. Value will be formatted.

index.js

@@ -1 +1,116 @@
-module.exports = require('./src/index.js');
+// options (global configuration settings)
+exports.options = require('./lib/options');
+
+// expression (Parser, Scope, Nodes)
+exports.expr = {};
+exports.expr.node = require('./lib/expr/node/index.js');
+exports.expr.Scope = require('./lib/expr/Scope.js');
+exports.expr.Parser = require('./lib/expr/Parser.js');
+
+// types (Matrix, Complex, Unit, ...)
+exports.type = require('./lib/type/index.js');
+
+// docs
+exports.docs = require('./lib/docs/index.js');
+
+// functions - arithmetic
+require('./lib/function/arithmetic/abs.js')(exports);
+require('./lib/function/arithmetic/add.js')(exports);
+require('./lib/function/arithmetic/add.js')(exports);
+require('./lib/function/arithmetic/ceil.js')(exports);
+require('./lib/function/arithmetic/cube.js')(exports);
+require('./lib/function/arithmetic/divide.js')(exports);
+require('./lib/function/arithmetic/edivide.js')(exports);
+require('./lib/function/arithmetic/emultiply.js')(exports);
+require('./lib/function/arithmetic/epow.js')(exports);
+require('./lib/function/arithmetic/equal.js')(exports);
+require('./lib/function/arithmetic/exp.js')(exports);
+require('./lib/function/arithmetic/fix.js')(exports);
+require('./lib/function/arithmetic/floor.js')(exports);
+require('./lib/function/arithmetic/gcd.js')(exports);
+require('./lib/function/arithmetic/larger.js')(exports);
+require('./lib/function/arithmetic/largereq.js')(exports);
+require('./lib/function/arithmetic/lcm.js')(exports);
+require('./lib/function/arithmetic/log.js')(exports);
+require('./lib/function/arithmetic/log10.js')(exports);
+require('./lib/function/arithmetic/mod.js')(exports);
+require('./lib/function/arithmetic/multiply.js')(exports);
+require('./lib/function/arithmetic/pow.js')(exports);
+require('./lib/function/arithmetic/round.js')(exports);
+require('./lib/function/arithmetic/sign.js')(exports);
+require('./lib/function/arithmetic/smaller.js')(exports);
+require('./lib/function/arithmetic/smallereq.js')(exports);
+require('./lib/function/arithmetic/sqrt.js')(exports);
+require('./lib/function/arithmetic/square.js')(exports);
+require('./lib/function/arithmetic/subtract.js')(exports);
+require('./lib/function/arithmetic/unary.js')(exports);
+require('./lib/function/arithmetic/unequal.js')(exports);
+require('./lib/function/arithmetic/xgcd.js')(exports);
+
+// functions - complex
+require('./lib/function/complex/arg.js')(exports);
+require('./lib/function/complex/conj.js')(exports);
+require('./lib/function/complex/re.js')(exports);
+require('./lib/function/complex/im.js')(exports);
+
+// functions - construction
+require('./lib/function/construction/boolean.js')(exports);
+require('./lib/function/construction/complex.js')(exports);
+require('./lib/function/construction/matrix.js')(exports);
+require('./lib/function/construction/number.js')(exports);
+require('./lib/function/construction/parser.js')(exports);
+require('./lib/function/construction/range.js')(exports);
+require('./lib/function/construction/string.js')(exports);
+require('./lib/function/construction/unit.js')(exports);
+
+// functions - matrix
+require('./lib/function/matrix/concat.js')(exports);
+require('./lib/function/matrix/det.js')(exports);
+require('./lib/function/matrix/diag.js')(exports);
+require('./lib/function/matrix/eye.js')(exports);
+require('./lib/function/matrix/inv.js')(exports);
+require('./lib/function/matrix/ones.js')(exports);
+require('./lib/function/matrix/size.js')(exports);
+require('./lib/function/matrix/squeeze.js')(exports);
+require('./lib/function/matrix/subset.js')(exports);
+require('./lib/function/matrix/transpose.js')(exports);
+require('./lib/function/matrix/zeros.js')(exports);
+
+// functions - probability
+require('./lib/function/probability/factorial.js')(exports);
+require('./lib/function/probability/random.js')(exports);
+
+// functions - statistics
+require('./lib/function/statistics/min.js')(exports);
+require('./lib/function/statistics/max.js')(exports);
+
+// functions - trigonometry
+require('./lib/function/trigonometry/acos.js')(exports);
+require('./lib/function/trigonometry/asin.js')(exports);
+require('./lib/function/trigonometry/atan.js')(exports);
+require('./lib/function/trigonometry/atan2.js')(exports);
+require('./lib/function/trigonometry/cos.js')(exports);
+require('./lib/function/trigonometry/cot.js')(exports);
+require('./lib/function/trigonometry/csc.js')(exports);
+require('./lib/function/trigonometry/sec.js')(exports);
+require('./lib/function/trigonometry/sin.js')(exports);
+require('./lib/function/trigonometry/tan.js')(exports);
+
+// functions - units
+require('./lib/function/units/in.js')(exports);
+
+// functions - utils
+require('./lib/function/utils/clone.js')(exports);
+require('./lib/function/utils/eval.js')(exports);
+require('./lib/function/utils/format.js')(exports);
+require('./lib/function/utils/help.js')(exports);
+require('./lib/function/utils/import.js')(exports);
+require('./lib/function/utils/parse.js')(exports);
+require('./lib/function/utils/select.js')(exports);
+require('./lib/function/utils/typeof.js')(exports);
+
+// constants
+require('./lib/constants.js')(exports);
+
+// selector (we initialize after all functions are loaded)
+exports.expr.Selector = require('./lib/expr/Selector.js')(exports);