Merge pull request #12 from foretold-app/improvements/1097

Improvements/1097

src/components/charts/DistributionPlot/distPlotD3.js

@@ -337,11 +337,14 @@ export class CdfChartD3 {
       .domain([yMinDomain, yMaxDomain])
       .range([this.calc.chartHeight, 0]);
 
+    const yTicks = Math.floor(this.calc.chartHeight / 20);
+    const yAxis = d3.axisLeft(yScale).ticks(yTicks);
+
     // Adds 'g' for an y-axis.
     this.chart.append('g')
       .attr('class', 'lollipops-y-axis')
       .attr('transform', `translate(${this.calc.chartWidth}, 0)`)
-      .call(d3.axisLeft(yScale));
+      .call(yAxis);
 
     function showTooltip(d) {
       d3.select('#lollipops-line-' + d.id)
@@ -400,9 +403,9 @@ export class CdfChartD3 {
       .enter()
       .append('rect')
       .attr('width', 30)
-      .attr('height', this.calc.chartHeight)
+      .attr('height', d => this.calc.chartHeight - yScale(d.y) + 10)
       .attr('x', d => common.xScale(d.x) - 15)
-      .attr('y', 0)
+      .attr('y', d => yScale(d.y) - 10)
       .attr('opacity', 0)
       .attr('pointer-events', 'all')
       .on('mouseover', showTooltip)
@@ -427,7 +430,10 @@ export class CdfChartD3 {
       case 'months':
         return d3.timeMonth.every(4);
       case 'quarters':
-        return d3.timeMonth.every(3);
+        // It is temporary solution, but it works
+        // if the difference between edge dates is not
+        // much more than 10 units.
+        return d3.timeMonth.every(12);
       case 'hours':
         return d3.timeHour.every(10);
       case 'days':

src/utility/GuesstimatorLibrary.js

@@ -34,14 +34,28 @@ const ratioSize = samples => {
 };
 
 
+/**
+ * @param values
+ * @param outputResolutionCount
+ * @param min
+ * @param max
+ * @returns {{discrete: {ys: *, xs: *}, continuous: {ys: [], xs: []}}}
+ */
 const toPdf = (values, outputResolutionCount, min, max) => {
   let duplicateSamples = _(values).groupBy().pickBy(x => x.length > 1).keys().value();
   let totalLength = _.size(values);
-  let frequencies = duplicateSamples.map(s => ({value: parseFloat(s), percentage: _(values).filter(x => x ==s).size()/totalLength}));
+  let frequencies = duplicateSamples.map(s => ({
+    value: parseFloat(s),
+    percentage: _(values).filter(x => x == s).size() / totalLength
+  }));
   let continuousSamples = _.difference(values, frequencies.map(f => f.value));
 
-  let discrete = {xs: frequencies.map(f => f.value), ys: frequencies.map(f => f.percentage)};
+  let discrete = {
+    xs: frequencies.map(f => f.value),
+    ys: frequencies.map(f => f.percentage)
+  };
   let continuous = { ys: [], xs: [] };
+
   if (continuousSamples.length > 20) {
     const samples = new Samples(continuousSamples);
 
@@ -51,20 +65,35 @@ const toPdf = (values, outputResolutionCount, min, max) => {
     const pdf = samples.toPdf({ size: outputResolutionCount, width, min, max });
     continuous = pdf;
   }
+
   return { continuous, discrete };
 };
 
-let run = (text, sampleCount, outputResolutionCount, inputs=[], min=false, max=false) => {
-    let [_error, item] = Guesstimator.parse({ text: "=" + text });
+/**
+ * @param text
+ * @param sampleCount
+ * @param outputResolutionCount
+ * @param inputs
+ * @param min
+ * @param max
+ * @returns {{discrete: {ys: *, xs: *}, continuous: {ys: *[], xs: *[]}}}
+ */
+const run = (
+  text,
+  sampleCount,
+  outputResolutionCount,
+  inputs = [],
+  min = false,
+  max = false,
+) => {
+  const [_error, item] = Guesstimator.parse({ text: "=" + text });
   const { parsedInput } = item;
-    const { guesstimateType } = parsedInput;
 
   const guesstimator = new Guesstimator({ parsedInput });
   const value = guesstimator.sample(
     sampleCount,
     inputs,
   );
-    const samplerType = guesstimator.samplerType();
 
   const values = _.filter(value.values, _.isFinite);
 
@@ -81,7 +110,7 @@ let run = (text, sampleCount, outputResolutionCount, inputs=[], min=false, max=f
     update = toPdf(values, outputResolutionCount, min, max);
   }
   return update;
-}
+};
 
 module.exports = {
   run,