Skip to content

Commit

Permalink
[UPDATE] dotfiles, accessor, Makefile etc.
Browse files Browse the repository at this point in the history
  • Loading branch information
Planeshifter committed May 25, 2015
1 parent c7785b8 commit b28638a
Show file tree
Hide file tree
Showing 10 changed files with 183 additions and 67 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
14 changes: 14 additions & 0 deletions .jshintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

# Directories #
###############
build/
reports/
dist/

# Node.js #
###########
/node_modules/

# Git #
#######
.git*
5 changes: 4 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ examples/
reports/
support/
test/
benchmark/

# Node.js #
###########
Expand Down Expand Up @@ -46,4 +47,6 @@ Desktop.ini
# Utilities #
#############
.jshintrc
.travis.yml
.jshintignore
.travis.yml
.editorconfig
11 changes: 9 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
language: node_js
node_js:
- "0.10"
- '0.12'
- '0.11'
- '0.10'
- '0.8'
- 'iojs'
before_install:
- npm update -g npm
after_script:
- npm run coveralls
- npm run coveralls

4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2014 Athan Reines.
Copyright (c) 2014-2015 The Compute.io Authors. All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
34 changes: 27 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,42 @@
# Set the node.js environment to test:
NODE_ENV ?= test

# Kernel name:
KERNEL ?= $(shell uname -s)

ifeq ($(KERNEL), Darwin)
OPEN ?= open
else
OPEN ?= xdg-open
endif

# NOTES #

NOTES ?= 'TODO|FIXME'
NOTES ?= 'TODO|FIXME|WARNING|HACK|NOTE'


# MOCHA #

# Specify the test framework bin locations:
MOCHA ?= ./node_modules/.bin/mocha
_MOCHA ?= ./node_modules/.bin/_mocha

# Specify the mocha reporter:
MOCHA_REPORTER ?= spec


# ISTANBUL #

# Istanbul configuration:
ISTANBUL ?= ./node_modules/.bin/istanbul
ISTANBUL_OUT ?= ./reports/coverage
ISTANBUL_REPORT ?= lcov
ISTANBUL_LCOV_INFO_PATH ?= $(ISTANBUL_OUT)/lcov.info
ISTANBUL_HTML_REPORT_PATH ?= $(ISTANBUL_OUT)/lcov-report/index.html


# JSHINT #

JSHINT ?= ./node_modules/.bin/jshint
JSHINT_REPORTER ?= ./node_modules/jshint-stylish/stylish.js



# FILES #

Expand Down Expand Up @@ -96,9 +106,20 @@ test-istanbul-mocha: node_modules
view-cov: view-istanbul-report

view-istanbul-report:
open $(ISTANBUL_HTML_REPORT_PATH)
$(OPEN) $(ISTANBUL_HTML_REPORT_PATH)


# LINT #

.PHONY: lint lint-jshint

lint: lint-jshint

lint-jshint: node_modules
$(JSHINT) \
--reporter $(JSHINT_REPORTER) \
./


# NODE #

Expand All @@ -117,7 +138,6 @@ clean-node:


# CLEAN #

.PHONY: clean

clean:
Expand Down
33 changes: 26 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@ For use in the browser, use [browserify](https://github.com/substack/node-browse

## Usage

To use the module,

``` javascript
var csum = require( 'compute-csum' );
```

#### csum( arr )
#### csum( arr[, accessor] )

Computes the cumulative sum of a numeric `array`.
Computes the cumulative sum of the values in the input `array`. For numeric `arrays`,

``` javascript
var data = [ 1, 2, 3, 4 ];
Expand All @@ -33,6 +32,26 @@ csum( data );
// returns [ 1, 3, 6, 10 ]
```

For non-numeric `arrays`, provide an accessor `function` for accessing `numeric` values.

``` javascript
var arr = [
{'x':1},
{'x':2},
{'x':3},
{'x':4},
];

function getValue( d ) {
return d.x;
}

var sum = csum( arr, getValue );
// returns [ 1, 3, 6, 10 ]
```


__Note__: if provided an empty `array`, the function returns `null`.

## Examples

Expand Down Expand Up @@ -69,7 +88,7 @@ The function returns an `array` with a length equal to the original input `array

### Unit

Unit tests use the [Mocha](http://visionmedia.github.io/mocha) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory:
Unit tests use the [Mocha](http://mochajs.org) test framework with [Chai](http://chaijs.com) assertions. To run the tests, execute the following command in the top-level application directory:

``` bash
$ make test
Expand All @@ -93,15 +112,15 @@ $ make view-cov
```


---
## License

[MIT license](http://opensource.org/licenses/MIT).
[MIT license](http://opensource.org/licenses/MIT).


---
## Copyright

Copyright © 2014. Athan Reines.
Copyright © 2014-2015. The Compute.io Authors.


[npm-image]: http://img.shields.io/npm/v/compute-csum.svg
Expand Down
74 changes: 36 additions & 38 deletions lib/index.js
Original file line number Diff line number Diff line change
@@ -1,51 +1,49 @@
/**
*
* COMPUTE: csum
*
*
* DESCRIPTION:
* - Computes the cumulative sum of a numeric array.
*
*
* NOTES:
* [1]
*
*
* TODO:
* [1]
*
*
* LICENSE:
* MIT
*
* Copyright (c) 2014. Athan Reines.
*
*
* AUTHOR:
* Athan Reines. kgryte@gmail.com. 2014.
*
*/

'use strict';

// MODULES //

var isArray = require( 'validate.io-array' ),
isFunction = require( 'validate.io-function' );

// CSUM //

/**
* FUNCTION: csum( arr )
* FUNCTION: csum( arr[, accessor] )
* Computes the cumulative sum of a numeric array.
*
* @param {Array} arr - numeric array
* @returns {Array} cumulative sum
* @param {Number[]|Array} arr - numeric array
* @param {Function} [accessor] - accessor function for accessing array values
* @returns {Number[]|Null} cumulative sum or null
*/
function csum( arr ) {
if ( !Array.isArray( arr ) ) {
throw new TypeError( 'csum()::invalid input argument. Must provide an array.' );
function csum( arr, clbk ) {
if ( !isArray( arr ) ) {
throw new TypeError( 'csum()::invalid input argument. Must provide an array. Value: `' + arr + '`.' );
}
if ( arguments.length > 1 && !isFunction( clbk ) ) {
throw new TypeError( 'csum()::invalid input argument. Accessor must be a function. Value: `' + clbk + '`.' );
}
var len = arr.length,
v = new Array( len );
v = new Array( len ),
val,
i;

v[ 0 ] = arr[ 0 ];
for ( var i = 1; i < len; i++ ) {
v[ i ] = v[ i-1 ] + arr[ i ];
if ( !len ) {
return null;
}

if ( clbk ) {
v[ 0 ] = clbk( arr[ 0 ], 0 );
for ( i = 1; i < len; i++ ) {
val = clbk( arr[i], i );
v[ i ] = v[ i-1 ] + val;
}
} else {
v[ 0 ] = arr[ 0 ];
for ( i = 1; i < len; i++ ) {
v[ i ] = v[ i-1 ] + arr[ i ];
}
}

return v;
} // end FUNCTION csum()

Expand Down
24 changes: 14 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
{
"name": "Athan Reines",
"email": "kgryte@gmail.com"
},
{
"name": "Philipp Burckhardt",
"email": "pburckhardt@outlook.com"
}
],
"scripts": {
Expand Down Expand Up @@ -37,17 +41,17 @@
"bugs": {
"url": "https://github.com/compute-io/csum/issues"
},
"dependencies": {},
"dependencies": {
"validate.io-array": "^1.0.5",
"validate.io-function": "^1.0.2"
},
"devDependencies": {
"chai": "1.x.x",
"mocha": "1.x.x",
"chai": "2.x.x",
"mocha": "2.x.x",
"coveralls": "^2.11.1",
"istanbul": "^0.3.0"
"istanbul": "^0.3.0",
"jshint": "2.x.x",
"jshint-stylish": "^1.0.0"
},
"licenses": [
{
"type": "MIT",
"url": "http://www.opensource.org/licenses/MIT"
}
]
"licenses": "MIT"
}

0 comments on commit b28638a

Please sign in to comment.