Projects >> histogram >>20439729d5471a3c6d88534ea8af9023ddb82cab

Chunk
Conflicting content 
    double binMax = _bins.lastKey();

    if (p < _minimum) {
<<<<<<< HEAD
      result = new SumResult(0, (T) _bins.firstEntry().getValue().getTarget().init());
    } else if (p >= _maximum) {
      result = new SumResult(getTotalCount(), getTotalTargetSum());
=======
        result = new SumResult(0, (T) _bins.firstEntry().getValue().getTarget().init());
    } else if (p >= _maximum) {
        result = new SumResult(getTotalCount(), getTotalTargetSum());
    } else if (p < binMin) {
      Bin bin = _bins.firstEntry().getValue();
      double distanceRatio = ((p - _minimum ) / (bin.getMean() - _minimum)) / 2;
      double countSum = distanceRatio * bin.getCount();
      T targetSum = (T) bin.getTarget().clone().mult(distanceRatio);
      result = new SumResult(countSum, targetSum);
    } else if (p > binMax) {
      Bin bin = _bins.lastEntry().getValue();
      double distanceRatio = ((_maximum - p) / (_maximum - bin.getMean())) / 2;
      if (distanceRatio > 0) {
        double countSum = getTotalCount() - distanceRatio * bin.getCount();
        T targetSum = (T) getTotalTargetSum().sum(bin.getTarget().clone().mult(-distanceRatio));
        result = new SumResult(countSum, targetSum);
      } else {
        result = new SumResult(getTotalCount(), getTotalTargetSum());
      }      
>>>>>>> e39421b8f862fdd8798b9b1687898d4b515ee4df
    } else if (p == binMax) {
      Bin lastBin = _bins.lastEntry().getValue();
Solution content 
    double binMax = _bins.lastKey();

    if (p < _minimum) {
      result = new SumResult(0, (T) _bins.firstEntry().getValue().getTarget().init());
    } else if (p >= _maximum) {
      result = new SumResult(getTotalCount(), getTotalTargetSum());
    } else if (p == binMax) {
      Bin lastBin = _bins.lastEntry().getValue();
File
Histogram.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Variable
Chunk
Conflicting content 
      }
      countDensity = (lowerResult.getCount() + higherResult.getCount()) / 2;
      targetDensity = (T) lowerResult.getTargetSum().clone().sum(higherResult.getTargetSum()).mult(0.5);
    } else {
<<<<<<< HEAD
      Entry> lowerEntry = _bins.lowerEntry(p);
      Bin lowerBin;
      if (lowerEntry == null) {
        lowerBin = new Bin(_minimum, 0, emptyTarget.clone());
=======
      Entry> lower = _bins.lowerEntry(p);
      Entry> higher = _bins.higherEntry(p);
      if (lower == null && higher == null) {
        countDensity = 0;
        targetDensity = null;
      } else if (lower == null || higher == null) {
        Bin bin;
        if (lower != null) {
          bin = lower.getValue();
        } else {
          bin = higher.getValue();
        }

        if (Math.abs(p - bin.getMean()) < binGapRange(p, bin)) {
          countDensity = binGapDensity(p, bin);
          targetDensity = (T) bin.getTarget().clone().mult(countDensity);
        } else {
          countDensity = 0;
          targetDensity = (T) bin.getTarget().init();
        }
>>>>>>> e39421b8f862fdd8798b9b1687898d4b515ee4df
      } else {
        lowerBin = lowerEntry.getValue();
Solution content 
      countDensity = (lowerResult.getCount() + higherResult.getCount()) / 2;
      } else {
      targetDensity = (T) lowerResult.getTargetSum().clone().sum(higherResult.getTargetSum()).mult(0.5);
    } else {
      Entry> lowerEntry = _bins.lowerEntry(p);
      Bin lowerBin;
      if (lowerEntry == null) {
        lowerBin = new Bin(_minimum, 0, emptyTarget.clone());
        lowerBin = lowerEntry.getValue();
      }
File
Histogram.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
    return (U) p.sum(i.clone().mult(iTerm)).sum(i1.clone().mult(i1Term));
  }

<<<<<<< HEAD
  // s = p + (1/2 + r - r^2/2)*i + r^2/2*i1
  // r = (x - m) / (m1 - m)
  // s_dx = i - (i1 - i) * (x - m) / (m1 - m)
  private  Target computeDensity(double r, double m, double m1, U i, U i1) {
    return i.clone().sum(i1.clone().sum(i.clone().mult(-1)).mult(r)).mult(1 / (m1 - m));
  }

=======
>>>>>>> e39421b8f862fdd8798b9b1687898d4b515ee4df
  private double findPointForSum(double s, TreeMap> binSumMap) {
    double result;
    if (s <= 0) {
Solution content 
    return (U) p.sum(i.clone().mult(iTerm)).sum(i1.clone().mult(i1Term));
  }

  // s = p + (1/2 + r - r^2/2)*i + r^2/2*i1
  // r = (x - m) / (m1 - m)
  // s_dx = i - (i1 - i) * (x - m) / (m1 - m)
  private  Target computeDensity(double r, double m, double m1, U i, U i1) {
    return i.clone().sum(i1.clone().sum(i.clone().mult(-1)).mult(r)).mult(1 / (m1 - m));
  }

  private double findPointForSum(double s, TreeMap> binSumMap) {
    double result;
    if (s <= 0) {
File
Histogram.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
      double a = m_i1 - m_i;

      double u;
<<<<<<< HEAD
      if (a == 0) {
=======
      if (a == 0 || m_i == 0 || m_i1 == 0) {
>>>>>>> e39421b8f862fdd8798b9b1687898d4b515ee4df
        double offset = d / ((m_i + m_i1) / 2);
        u = p_i + (offset * (p_i1 - p_i));
      } else {
Solution content 
      double a = m_i1 - m_i;

      double u;
      if (a == 0) {
        double offset = d / ((m_i + m_i1) / 2);
        u = p_i + (offset * (p_i1 - p_i));
      } else {
File
Histogram.java
Developer's decision
Version 1
Kind of conflict
If statement