diff --git a/lib/findPaths.js b/lib/findPaths.js index ee71fdd..5cabaa2 100644 --- a/lib/findPaths.js +++ b/lib/findPaths.js @@ -7,10 +7,13 @@ let avg = arr => arr.reduce((a,b) => (a+b)) / arr.length let formatLargeOrSmall = num => { if(num > 1){ return toLocale(truncateValueForDisplay(num)) - }else if(num != 0){ + }else if(num > 0){ return num.toFixed(-Math.floor(Math.log(num)/Math.log(10))); + }else if(num > -1){ + return num.toFixed(-Math.floor(Math.log(-num)/Math.log(10))); }else{ - return num//return "~0" + return toLocale(num)//return "~0" + } } diff --git a/lib/labeledgraph.js b/lib/labeledgraph.js index 3f18d29..210cc97 100644 --- a/lib/labeledgraph.js +++ b/lib/labeledgraph.js @@ -118,6 +118,7 @@ function drawGraphInner({nodes, links}){ return height-32-(Math.abs(start-end)/2)//height-30 }) .text(function(d){ + return Number(d.distance) return(truncateValueForDisplay(Number(d.distance))) //return(Number(d.distance).toPrecision(2).toString()) }) diff --git a/lib/slider.js b/lib/slider.js index bfae5f4..fe05cb4 100644 --- a/lib/slider.js +++ b/lib/slider.js @@ -133,7 +133,11 @@ export function SubmitSliderButton({posList, binaryComparisons, sliderValue, toC // console.log("input@SubmitSliderButton") console.log(obj) - nextStepSlider(obj) + if(sliderValue >= 0 ){ + nextStepSlider(obj) + }else if(sliderValue < 0){ + alert("Negative numbers not yet allowed") + } } return(