convert frequencies into trips for transit routes that are specified …

src/main/scala/beam/router/r5/NetworkCoordinator.scala

@@ -4,14 +4,17 @@ import java.nio.file.Files.exists
 import java.nio.file.Paths
 
 import beam.sim.config.BeamConfig
-import com.conveyal.r5.transit.TransportNetwork
+import com.conveyal.r5.transit.{TransportNetwork, TripSchedule}
 import com.typesafe.scalalogging.LazyLogging
 import org.matsim.api.core.v01.network.{Network, NetworkWriter}
 import org.matsim.core.network.NetworkUtils
 import org.matsim.core.network.io.MatsimNetworkReader
 
+import scala.collection.JavaConverters._
+
 class NetworkCoordinator(beamConfig: BeamConfig) extends LazyLogging {
 
+
   var transportNetwork: TransportNetwork = _
   var network: Network = _
 
@@ -49,4 +52,36 @@ class NetworkCoordinator(beamConfig: BeamConfig) extends LazyLogging {
     }
   }
 
+  def convertFrequenciesToTrips() = {
+    transportNetwork.transitLayer.tripPatterns.asScala.foreach { tp =>
+      if (tp.hasFrequencies) {
+        val toAdd: Vector[TripSchedule] = tp.tripSchedules.asScala.toVector.flatMap { ts =>
+          val tripStartTimes = ts.startTimes(0).until(ts.endTimes(0)).by(ts.headwaySeconds(0)).toVector
+          tripStartTimes.zipWithIndex.map { case (startTime, ind) =>
+            val tsNew = ts.clone().asInstanceOf[TripSchedule]
+            val newTripId = s"${tsNew.tripId}-$ind"
+            val newArrivals = new Array[Int](ts.arrivals.size)
+            val newDepartures = new Array[Int](ts.arrivals.size)
+            for (i <- 0.until(tsNew.arrivals.length)) {
+              newArrivals(i) = tsNew.arrivals(i) + startTime
+              newDepartures(i) = tsNew.departures(i) + startTime
+            }
+            tsNew.arrivals = newArrivals
+            tsNew.departures = newDepartures
+            tsNew.tripId = newTripId
+            tsNew.frequencyEntryIds = null
+            tsNew.headwaySeconds = null
+            tsNew.startTimes = null
+            tsNew.endTimes = null
+            tsNew
+          }
+        }
+        tp.tripSchedules.clear()
+        toAdd.foreach(tp.tripSchedules.add(_))
+        tp.hasFrequencies = false
+      }
+    }
+    transportNetwork.transitLayer.hasFrequencies = false
+  }
+
 }

src/main/scala/beam/sim/BeamHelper.scala

@@ -330,13 +330,14 @@ trait BeamHelper extends LazyLogging {
   }
 
   def runBeamWithConfig(config: TypesafeConfig): (Config, String) = {
-    val (matsimConfig, outputDir, beamServices) = setupBeamWithConfig(config)
+    val (matsimConfig, outputDir, beamServices, networkCoordinator) = setupBeamWithConfig(config)
+    networkCoordinator.convertFrequenciesToTrips()
 
     run(beamServices)
     (matsimConfig, outputDir)
   }
 
-  def setupBeamWithConfig(config: TypesafeConfig): (Config, String, BeamServices) = {
+  def setupBeamWithConfig(config: TypesafeConfig): (Config, String, BeamServices, NetworkCoordinator) = {
     val beamConfig = BeamConfig(config)
     level = beamConfig.beam.metrics.level
     runName = beamConfig.beam.agentsim.simulationName
@@ -395,7 +396,7 @@ trait BeamHelper extends LazyLogging {
 
     samplePopulation(scenario, beamConfig, matsimConfig, beamServices)
 
-    (matsimConfig, outputDirectory, beamServices)
+    (matsimConfig, outputDirectory, beamServices, networkCoordinator)
   }
 
   def run(beamServices: BeamServices){