Merge branch 'develop' into tc_issue_98

TheTransitClock · Sep 7, 2018 · a8e7ebe · a8e7ebe
2 parents 2cfae2a + a72b95d
commit a8e7ebe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/transitclock/pom.xml b/transitclock/pom.xml
@@ -258,18 +258,30 @@
 			<version>3.0.1</version>
 			<scope>provided</scope>
 		</dependency>
+
+		<!--  OLS regression algorithm -->
+		<dependency>
+      		<groupId>com.github.haifengl</groupId>
+      		<artifactId>smile-core</artifactId>
+      		<version>1.5.1</version>
+    	</dependency>
+
 		<!-- Logback log appender for AWS CloudWatch -->
 		<dependency>
 			<groupId>com.j256.cloudwatchlogbackappender</groupId>
 			<artifactId>cloudwatchlogbackappender</artifactId>
 			<version>1.11</version>
 		</dependency>
+
 		<!--  OLS regression algorithm -->
 		<dependency>
       		<groupId>com.github.haifengl</groupId>
       		<artifactId>smile-core</artifactId>
       		<version>1.5.1</version>
     	</dependency>
+
+
+
 	</dependencies>
 
 	<build>

diff --git a/...ck/src/main/java/org/transitclock/core/headwaygenerator/LastArrivalsHeadwayGenerator.java b/...ck/src/main/java/org/transitclock/core/headwaygenerator/LastArrivalsHeadwayGenerator.java
@@ -35,6 +35,7 @@ public  Headway generate(VehicleState vehicleState) {
 
 			if(vehicleState.getMatch().getMatchAtPreviousStop()==null)
 				return null;
+
 			String stopId = vehicleState.getMatch().getMatchAtPreviousStop().getAtStop().getStopId();
 
 			long date = vehicleState.getMatch().getAvlTime();
@@ -46,6 +47,7 @@ public  Headway generate(VehicleState vehicleState) {
 			List<ArrivalDeparture> stopList=StopArrivalDepartureCacheFactory.getInstance().getStopHistory(key);
 			int lastStopArrivalIndex =-1;
 			int previousVehicleArrivalIndex = -1;
+
 			if(stopList!=null)
 			{
 				for(int i=0;i<stopList.size() && previousVehicleArrivalIndex==-1 ;i++)