Fix merge issues

Author: PhilJay

MPChartLib/src/com/github/mikephil/charting/data/ChartData.java

@@ -38,11 +38,6 @@ public abstract class ChartData<T extends DataSet<? extends Entry>> {
 
     protected float mRightAxisMin = 0.0f;
 
-    /**
-     * the total sum of all y-values
-     */
-    private float mYValueSum = 0f;
-
     /**
      * total number of y-values across all DataSet objects
      */
@@ -152,7 +147,6 @@ protected void init() {
         checkLegal();
 
         calcMinMax(mLastStart, mLastEnd);
-        calcYValueSum();
         calcYValueCount();
 
         calcXValAverageLength();
@@ -283,21 +277,6 @@ public void calcMinMax(int start, int end) {
         }
     }
 
-    /**
-     * calculates the sum of all y-values in all datasets
-     */
-    protected void calcYValueSum() {
-
-        mYValueSum = 0;
-
-        if (mDataSets == null)
-            return;
-
-        for (int i = 0; i < mDataSets.size(); i++) {
-            mYValueSum += mDataSets.get(i).getYValueSum();
-        }
-    }
-
     /**
      * Calculates the total number of y-values across all DataSets the ChartData
      * represents.
@@ -333,15 +312,6 @@ public int getDataSetCount() {
         return mDataSets.size();
     }
 
-    /**
-     * Returns the average value across all entries in this Data object
-     * (all entries from the DataSets this data object holds)
-     * @return
-     */
-    public float getAverage() {
-        return (float ) getYValueSum() / (float) getYValCount();
-    }
-
     /**
      * Returns the smallest y-value the data object contains.
      *
@@ -396,16 +366,6 @@ public float getXValAverageLength() {
         return mXValAverageLength;
     }
 
-    /**
-     * Returns the total y-value sum across all DataSet objects the this object
-     * represents.
-     *
-     * @return
-     */
-    public float getYValueSum() {
-        return mYValueSum;
-    }
-
     /**
      * Returns the total number of y-values across all DataSet objects the this
      * object represents.
@@ -565,7 +525,6 @@ public void addDataSet(T d) {
             return;
 
         mYValCount += d.getEntryCount();
-        mYValueSum += d.getYValueSum();
 
         if (mDataSets.size() <= 0) {
 
@@ -642,7 +601,6 @@ public boolean removeDataSet(T d) {
         if (removed) {
 
             mYValCount -= d.getEntryCount();
-            mYValueSum -= d.getYValueSum();
 
             calcMinMax(mLastStart, mLastEnd);
         }
@@ -714,7 +672,6 @@ public void addEntry(Entry e, int dataSetIndex) {
             }
 
             mYValCount += 1;
-            mYValueSum += val;
 
             handleEmptyAxis(getFirstLeft(), getFirstRight());
 
@@ -745,7 +702,6 @@ public boolean removeEntry(Entry e, int dataSetIndex) {
             float val = e.getVal();
 
             mYValCount -= 1;
-            mYValueSum -= val;
 
             calcMinMax(mLastStart, mLastEnd);
         }

MPChartLib/src/com/github/mikephil/charting/data/DataSet.java

@@ -44,11 +44,6 @@ public abstract class DataSet<T extends Entry> {
      */
     protected float mYMin = 0.0f;
 
-    /**
-     * the total sum of all y-values
-     */
-    private float mYValueSum = 0f;
-
     /**
      * the last start value used for calcMinMax
      */
@@ -126,15 +121,13 @@ public DataSet(List<T> yVals, String label) {
         mColors.add(Color.rgb(140, 234, 255));
 
         calcMinMax(mLastStart, mLastEnd);
-        calcYValueSum();
     }
 
     /**
      * Use this method to tell the data set that the underlying data has changed
      */
     public void notifyDataSetChanged() {
         calcMinMax(mLastStart, mLastEnd);
-        calcYValueSum();
     }
 
     /**
@@ -179,29 +172,6 @@ protected void calcMinMax(int start, int end) {
         }
     }
 
-    /**
-     * calculates the sum of all y-values
-     */
-    private void calcYValueSum() {
-
-        mYValueSum = 0;
-
-        for (int i = 0; i < mYVals.size(); i++) {
-            Entry e = mYVals.get(i);
-            if (e != null)
-                mYValueSum += e.getVal();
-        }
-    }
-
-    /**
-     * Returns the average value across all entries in this DataSet.
-     *
-     * @return
-     */
-    public float getAverage() {
-        return (float) getYValueSum() / (float) getValueCount();
-    }
-
     /**
      * returns the number of y-values this DataSet represents
      *
@@ -365,15 +335,6 @@ public List<T> getYVals() {
         return mYVals;
     }
 
-    /**
-     * gets the sum of all y-values
-     *
-     * @return
-     */
-    public float getYValueSum() {
-        return mYValueSum;
-    }
-
     /**
      * returns the minimum y-value this DataSet holds
      *
@@ -556,8 +517,6 @@ public void addEntry(Entry e) {
                 mYMin = val;
         }
 
-        mYValueSum += val;
-
         // add the entry
         mYVals.add((T) e);
     }
@@ -592,8 +551,6 @@ public void addEntryOrdered(Entry e) {
                 mYMin = val;
         }
 
-        mYValueSum += val;
-
         if (mYVals.size() > 0 && mYVals.get(mYVals.size() - 1).getXIndex() > e.getXIndex()) {
             int closestIndex = getEntryIndex(e.getXIndex(), Rounding.UP);
             mYVals.add(closestIndex, (T) e);
@@ -622,7 +579,6 @@ public boolean removeEntry(T e) {
         if (removed) {
 
             float val = e.getVal();
-            mYValueSum -= val;
 
             calcMinMax(mLastStart, mLastEnd);
         }
@@ -657,7 +613,6 @@ public boolean removeFirst() {
         if (removed) {
 
             float val = entry.getVal();
-            mYValueSum -= val;
 
             calcMinMax(mLastStart, mLastEnd);
         }
@@ -683,7 +638,6 @@ public boolean removeLast() {
         if (removed) {
 
             float val = entry.getVal();
-            mYValueSum -= val;
 
             calcMinMax(mLastStart, mLastEnd);
         }