Merge commit '3dd033de496f74a541c3117f3e7432cbb8bce2c7'

* commit '3dd033de496f74a541c3117f3e7432cbb8bce2c7': (37 commits)
  Remove unuseful breaking test
  Update .travis.yml
  Add "Graph" button to Compact devices
  Further fixes for more substantive comments on PR Boris-Em#295 Fix top reference line offset bug Adds categories for UIKit extensions in MasterVC Adds Options title for iPhone version of TestBed Only changes in storyboard due to newer IB
  Requested changes to PR 3295 Fixing breaks, spaces to match project style Explaining constant 4 in BEMLine (note bug on line76 0+offset should be 0)
  Bug fixes: Line clipsToBounds to avoid drawing outside the box (when extrapolating nulls or user set minValue too High) Top/Bottom reference lines were outside box When Bezier off and Interpolate nulls off, properly draws line segments now Removed VMA NSLog from TestBed/MasterController
  Fix bug with TouchLineInput color (doesn't change after initial setting)
  Allow use on iPhone and Split View
  Fix assorted bugs in BEMSimpleLineGraph, especially null-data related AverageLine: •Color should be picked up from line if not set (default nil) Typo in encoding macro
  Add colors, gradients, and alphas to TestBed Fix many bugs and buglets
  Create new TestBed app to manipulate almost all parameters Add coding to AverageLine Move gradient properties to strong to properly retain Fix compiler error about integers used in enums Change alwaysDisplayPopupatIndex to use NSUInteger for index instead of float Fix Frame warning in SimpleLineChart's launch Screen
  Add Types to all Arrays
  Add encoder/decoder for BEMLineGraph properties Add averageValue delegate method to allow BEMLineGraph to be separate from BEMCalculator Restore modifyPopUpView delegate method Use caption preferredFont instead of SystemFont fro NoData Handle overlapping labels better Reuse code for popup and permanent labels
  Travis CI
  Yet another Travis CI change
  Update .travis.yml
  N^th time's a charm?
  Storyboard Update (to fix Travis CI)
  Update .travis.yml
  Update .travis.yml
  ...

# Conflicts:
#	Classes/BEMLine.m
#	Classes/BEMSimpleLineGraphView.h
#	Classes/BEMSimpleLineGraphView.m

Author: fly-by-wire

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode7
-# xcode_project: Sample Project/SimpleLineChart.xcodeproj
-# xcode_scheme: SimpleLineChartTests
-# xcode_sdk: iphonesimulator
+osx_image: xcode8.2
+xcode_project: Sample Project/SimpleLineChart.xcodeproj
+xcode_scheme: SimpleLineChartTests
+xcode_sdk: iphonesimulator
 script:
-  - xcodebuild clean build test -project "Sample Project/SimpleLineChart.xcodeproj" -scheme SimpleLineChartTests -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO 
+  - xcodebuild clean build test -project "Sample Project/SimpleLineChart.xcodeproj" -scheme SimpleLineChartTests -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone 7" ONLY_ACTIVE_ARCH=NO 

Classes/BEMAverageLine.h

@@ -11,15 +11,15 @@
 
 
 /// A line displayed horizontally across the graph at the average y-value
-@interface BEMAverageLine : NSObject
+@interface BEMAverageLine : NSObject <NSCoding>
 
 
 /// When set to YES, an average line will be displayed on the line graph
 @property (nonatomic) BOOL enableAverageLine;
 
 
 /// The color of the average line
-@property (strong, nonatomic) UIColor *color;
+@property (strong, nonatomic, nonnull) UIColor *color;
 
 
 /// The Y-Value of the average line. This could be an average, a median, a mode, sum, etc.
@@ -35,7 +35,14 @@
 
 
 /// Dash pattern for the average line
-@property (strong, nonatomic) NSArray *dashPattern;
+@property (strong, nonatomic, nullable) NSArray <NSNumber *> *dashPattern;
 
 
+//Label for average line in y axis. Default is blank.
+@property (strong, nonatomic, nullable) NSString * title;
+
+
+/// Title label on screen
+@property (strong, nonatomic, nullable) UILabel *label;
+
 @end

Classes/BEMAverageLine.m

@@ -14,13 +14,60 @@ - (instancetype)init {
     self = [super init];
     if (self) {
         _enableAverageLine = NO;
-        _color = [UIColor whiteColor];
         _alpha = 1.0;
         _width = 3.0;
-        _yValue = 0.0;
+        _yValue = NAN;
     }
 
     return self;
 }
 
+- (instancetype) initWithCoder:(NSCoder *)coder {
+
+#define RestoreProperty(property, type) {\
+if ([coder containsValueForKey:@#property]) { \
+self.property = [coder decode ## type ##ForKey:@#property ]; \
+}\
+}
+    self = [self init];
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnullable-to-nonnull-conversion"
+
+    RestoreProperty (enableAverageLine, Bool);
+    RestoreProperty (color, Object);
+    RestoreProperty (yValue, Double);
+    RestoreProperty (alpha, Double);
+    RestoreProperty (width, Double);
+    RestoreProperty (dashPattern, Object);
+    RestoreProperty (title, Object);
+#pragma clang diagnostic pop
+
+    //AverageLine
+    return self;
+}
+
+- (void) encodeWithCoder: (NSCoder *)coder {
+
+#define EncodeProperty(property, type) [coder encode ## type: self.property forKey:@#property]
+    EncodeProperty (enableAverageLine, Bool);
+    EncodeProperty (color, Object);
+    EncodeProperty (yValue, Float);
+    EncodeProperty (alpha, Float);
+    EncodeProperty (width, Float);
+    EncodeProperty (dashPattern, Object);
+    EncodeProperty (title, Object);
+}
+
+
+
+- (void)setLabel:(UILabel *)label {
+    if (_label != label) {
+        [_label removeFromSuperview];
+        _label = label;
+    }
+}
+
+- (void)dealloc {
+    self.label= nil;
+}
 @end

Classes/BEMCircle.h

@@ -18,8 +18,12 @@
 /// Set to YES if the data point circles should be constantly displayed. NO if they should only appear when relevant.
 @property (assign, nonatomic) BOOL shouldDisplayConstantly;
 
-/// The point color
-@property (strong, nonatomic) UIColor *Pointcolor;
+/// The point's color
+@property (strong, nonatomic, nullable) UIColor *color;
+
+/** The point color
+ @deprecated This property is no longer in use. Please use the \p color property instead. */
+@property (strong, nonatomic, null_unspecified) UIColor *Pointcolor __deprecated_msg("Use color instead");
 
 /// The value of the point
 @property (nonatomic) CGFloat absoluteValue;

Classes/BEMCircle.m

@@ -23,7 +23,7 @@ - (instancetype)initWithFrame:(CGRect)frame {
 - (void)drawRect:(CGRect)rect {
     CGContextRef ctx = UIGraphicsGetCurrentContext();
     CGContextAddEllipseInRect(ctx, rect);
-    [self.Pointcolor set];
+    [self.color set];
     CGContextFillPath(ctx);
 }
 

Classes/BEMGraphCalculator.h

@@ -0,0 +1,129 @@
+//
+//  BEMGraphCalculator.h
+//  SimpleLineChart
+//
+//  Created by Sam Spencer on 1/26/16.
+//  Copyright © 2016 Boris Emorine. All rights reserved.
+//
+
+@import Foundation;
+
+#import "BEMSimpleLineGraphView.h"
+
+/** There are multiple ways to find the area under the curve of a graph; \p BEMIntegrationMethod describes available methods for calculating this area.
+ @discussion Finding the area under the curve of a graph becomes especially useful when charting rate over time. For example, finding the area of a graph that displays the speed of a cyclist at certain times would produce the total distance the cyclist traveled.
+ @abstract Integration is a concept in calculus allowing one to find the area under a curve. However, integration requires manipulating the function of a graph. Because \p BEMSimpleLineGraphView objects rely on data points and not functions, other area-finding methods (with varying levels of accuracy) are employed here.
+ @note As a general rule, the more accurate an integration method, the more computationally intense it may be. */
+typedef NS_ENUM (NSInteger, BEMIntegrationMethod) {
+    /// Calculates area by finding the sum of all left–hand rectangles under each data point. This method gives the exact area when the graph's curve is constant. Low intensity computation.
+    BEMIntegrationMethodLeftReimannSum = 0,
+    /// Calculates area by finding the sum of all right–hand rectangles under each data point. This method gives the exact area when the graph's curve is constant. Low intensity computation.
+    BEMIntegrationMethodRightReimannSum = 1,
+    /// Calculates area by finding the sum of all trapezoids under each data point. This method gives the exact area when the graph's curve is constant or linear. Moderate intensity computation.
+    BEMIntegrationMethodTrapezoidalSum = 2,
+    /// Calculates area by finding the sum of all parabolas under each data point. This method gives the exact area when the graph's curve is constant, linear, quadratic, or cubic. Moderate intensity computation.
+    BEMIntegrationMethodParabolicSimpsonSum = 3
+};
+
+/** There are multiple methods to determine the correlation between points on a graph; \p BEMCorrelationMethod describes available methods for determining this coefficient.
+ @discussion Discussion on data correlation to be added.
+ @abstract Abstract on data correlation to be added.
+ @note The greater the number of points on the given graph, the longer it may take to determine a correlation for those points.  */
+typedef NS_ENUM (NSInteger, BEMCorrelationMethod) {
+    /// Calculates the correlation coefficent for the graph using the common Pearson Correlation Method.
+    BEMCorrelationMethodPearson = 0
+};
+
+/** When calculating a correlation coefficient with the Pearson Correlation Method, \p BEMGraphCalculator can provide more general feedback as to the strength of the correlation. */
+typedef NS_ENUM (NSInteger, BEMPearsonCorrelationStrength) {
+    /// Positive correlation value: 1.00 : 0.95
+    BEMPearsonCorrelationPerfectPositive = 0,
+    /// Positive correlation value: 0.94 : 0.50
+    BEMPearsonCorrelationStrongPositive = 1,
+    /// Positive correlation value: 0.49 : 0.06
+    BEMPearsonCorrelationWeakPositive = 2,
+    /// Positive correlation value: 0.05 : -0.05
+    BEMPearsonCorrelationNone = 3,
+    /// Positive correlation value: -0.06 : -0.49
+    BEMPearsonCorrelationWeakNegative = 4,
+    /// Positive correlation value: -0.50 : -0.94
+    BEMPearsonCorrelationStrongNegative = 5,
+    /// Positive correlation value: -0.95 : -1.00
+    BEMPearsonCorrelationPerfectNegative = 6
+};
+
+
+NS_ASSUME_NONNULL_BEGIN
+
+/** Makes calculations given for a specific graph object. 
+ @discussion Supply a graph object to the calculator to perform operations with that graph's data. Calculations may include the following:  
+   - Average value of points
+   - Sum of points  
+   - Median of points  
+   - Mode of points  
+   - Graph standard deviation  
+   - Minimum point value on graph  
+   - Maximum point value on graph  
+   - Area under the curve of a graph  
+   - Correlation of data points */
+@interface BEMGraphCalculator : NSObject
+
++ (BEMGraphCalculator *)sharedCalculator;
+
+/** Calculates the average (mean) of all points on the line graph.
+ @return The average (mean) number of the points on the graph. Originally a float. */
+- (NSNumber *)calculatePointValueAverageOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the sum of all points on the line graph.
+ @return The sum of the points on the graph. Originally a float. */
+- (NSNumber *)calculatePointValueSumOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the median of all points on the line graph.
+ @return The median number of the points on the graph. Originally a float. */
+- (NSNumber *)calculatePointValueMedianOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the mode of all points on the line graph.
+ @return The mode number of the points on the graph. Originally a float. */
+- (NSNumber *)calculatePointValueModeOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the standard deviation of all points on the line graph.
+ @return The standard deviation of the points on the graph. Originally a float. */
+- (NSNumber *)calculateStandardDeviationOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the minimum value of all points on the line graph.
+ @return The minimum number of the points on the graph. Originally a float. */
+- (NSNumber *)calculateMinimumPointValueOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the maximum value of all points on the line graph.
+ @return The maximum value of the points on the graph. Originally a float. */
+- (NSNumber *)calculateMaximumPointValueOnGraph:(BEMSimpleLineGraphView *)graph;
+
+
+/** Calculates the area under the curve of the graph.
+ @return The area under the curve of the graph. Accuracy varies based on selected integration method. Originally a float. */
+- (NSNumber *)calculateAreaUsingIntegrationMethod:(BEMIntegrationMethod)integrationMethod onGraph:(BEMSimpleLineGraphView *)graph xAxisScale:(NSNumber *)scale;
+
+
+/** Calculates a correlation coefficient for the data points on the graph.
+ @return A correlation coefficient, calculated from the graph's data points. Float value between -1.0 and 1.0. A value of -1.0 is a perfect negative correlation. A value of 1.0 is a perfect positive correlation. A value of 0.0 means that no correlation exists. */
+- (NSNumber *)calculateCorrelationCoefficientUsingCorrelationMethod:(BEMCorrelationMethod)correlationMethod onGraph:(BEMSimpleLineGraphView *)graph xAxisScale:(nonnull NSNumber *)scale;
+
+
+/** Calculates a correlation coefficient and returns the general strength of the correlation, based on the data points on the given graph object.
+ @return The strength of the calculated correlation coefficient; calculated from the graph's data points. This method assumes the Pearson Correlation Method. */
+- (BEMPearsonCorrelationStrength)calculatePearsonCorrelationStrengthOnGraph:(BEMSimpleLineGraphView *)graph xAxisScale:(nonnull NSNumber *)scale;
+
+
+/** Calculates a correlation coefficient and returns the general strength of the correlation, based on the data points on the given graph object.
+ @return The strength of the calculated correlation coefficient; calculated from the graph's data points. This method assumes the Pearson Correlation Method. */
+- (BEMPearsonCorrelationStrength)calculatePearsonCorrelationStrengthOnGraph:(BEMSimpleLineGraphView *)graph;
+
+@end
+
+NS_ASSUME_NONNULL_END