Skip to content

Commit

Permalink
formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
ConnorStroomberg committed Oct 23, 2014
1 parent b15377f commit 6b961a9
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 12 deletions.
2 changes: 1 addition & 1 deletion app/js/services/errorHandling.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define(['angular'], function(angular) {
code: data.code,
cause: data.message
};
}else {
} else {
message = {
cause: 'an unknown error occurred'
};
Expand Down
30 changes: 19 additions & 11 deletions app/js/services/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,21 @@ define(['underscore', 'angular'], function(_, angular) {
return angular.module('elicit.util', [])

.factory('intervalHull', function() {

return function(scaleRanges) {
if (!scaleRanges) return [Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY];
if (!scaleRanges) {
return [Number.NEGATIVE_INFINITY, Number.POSITIVE_INFINITY];
}
return [
Math.min.apply(null, _.map(_.values(scaleRanges), function(alt) { return alt["2.5%"] })),
Math.max.apply(null, _.map(_.values(scaleRanges), function(alt) { return alt["97.5%"] }))
Math.min.apply(null, _.map(_.values(scaleRanges), function(alt) {
return alt["2.5%"];
})),
Math.max.apply(null, _.map(_.values(scaleRanges), function(alt) {
return alt["97.5%"];
}))
];
};

})

.factory('ValueTreeUtil', function() {
Expand All @@ -19,16 +27,16 @@ define(['underscore', 'angular'], function(_, angular) {
if (valueTree.criteria) {
criteriaNodes.push(valueTree);
} else {
angular.forEach(valueTree.children, function (childNode) {
angular.forEach(valueTree.children, function(childNode) {
findCriteriaNodesInternal(childNode, criteriaNodes);
});
}
};
}

var criteriaNodes = [];
findCriteriaNodesInternal(valueTree, criteriaNodes);
return criteriaNodes;
};
}


function findTreePath(criteriaNode, valueTree) {
Expand All @@ -39,15 +47,15 @@ define(['underscore', 'angular'], function(_, angular) {
return [];
} else {
var children = [];
angular.forEach(valueTree.children, function (childNode) {
angular.forEach(valueTree.children, function(childNode) {
var childPaths = findTreePath(criteriaNode, childNode);
if (childPaths.length > 0) {
children = [valueTree].concat(childPaths);
}
});
return children;
}
};
}

/**
* Insert the criteria objects into the value tree.
Expand All @@ -64,12 +72,12 @@ define(['underscore', 'angular'], function(_, angular) {
});
});
return tree;
};
}

return {
'findCriteriaNodes' : findCriteriaNodes,
'findCriteriaNodes': findCriteriaNodes,
'findTreePath': findTreePath,
'addCriteriaToValueTree': addCriteriaToValueTree
};
});
});
});

0 comments on commit 6b961a9

Please sign in to comment.