Remove comments. (Fast-Trips#85)

danielsclint · Dec 11, 2017 · f2e3d6a · f2e3d6a
1 parent 161a80c
commit f2e3d6a
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 137 deletions.
diff --git a/fasttrips/FastTrips.py b/fasttrips/FastTrips.py
@@ -133,17 +133,6 @@ def read_input_files(self):
               'service_id': service_ids
             },
         })
-        #loader             = transitfeed.Loader(Assignment.INPUT_NETWORK_DIR, memory_db=True)
-        #self.gtfs_schedule = loader.Load()
-
-        #if False:
-        #    # Validate the GTFS
-        #    FastTripsLogger.info("Validating GTFS schedule")
-        #    self.gtfs_schedule.Validate()
-        #    FastTripsLogger.info("Done validating GTFS schedule")
-
-        # Required: Trips, Routes, Stops, Stop Times, Agency, Calendar
-        # Optional: Transfers, Shapes, Calendar Dates...
 
         # Read Stops (gtfs-required)
         self.stops = Stop(Assignment.INPUT_NETWORK_DIR, Assignment.OUTPUT_DIR,

diff --git a/fasttrips/Route.py b/fasttrips/Route.py
@@ -160,19 +160,6 @@ def __init__(self, input_dir, output_dir, gtfs, today, stops):
         """
         self.output_dir         = output_dir
 
-        # Combine all gtfs Route objects to a single pandas DataFrame
-        #route_dicts = []
-        #for gtfs_route in gtfs_schedule.GetRouteList():
-        #    for gtfs_trip in gtfs_route.trips:
-        #        if gtfs_trip.service_period.IsActiveOn(today.strftime("%Y%m%d"), date_object=today):
-        #            route_dict = {}
-        #            for fieldname in gtfs_route._FIELD_NAMES:
-        #                if fieldname in gtfs_route.__dict__:
-        #                    route_dict[fieldname] = gtfs_route.__dict__[fieldname]
-        #            route_dicts.append(route_dict)
-        #            break
-        #
-        #self.routes_df = pandas.DataFrame(data=route_dicts)
         self.routes_df = gtfs.routes
 
         FastTripsLogger.info("Read %7d %15s from %25d %25s" %
@@ -226,39 +213,13 @@ def __init__(self, input_dir, output_dir, gtfs, today, stops):
         FastTripsLogger.info("Read %7d %15s from %25s, %25s" %
                              (len(self.routes_df), "routes", "routes.txt", Route.INPUT_ROUTES_FILE))
 
-
-        #agency_dicts = []
-        #for gtfs_agency in gtfs_schedule.GetAgencyList():
-        #    agency_dict = {}
-        #    for fieldname in gtfs_agency._FIELD_NAMES:
-        #        if fieldname in gtfs_agency.__dict__:
-        #            agency_dict[fieldname] = gtfs_agency.__dict__[fieldname]
-        #    agency_dicts.append(agency_dict)
-        #self.agencies_df = pandas.DataFrame(data=agency_dicts)
         self.agencies_df = gtfs.agency
 
         FastTripsLogger.debug("=========== AGENCIES ===========\n" + str(self.agencies_df.head()))
         FastTripsLogger.debug("\n"+str(self.agencies_df.dtypes))
         FastTripsLogger.info("Read %7d %15s from %25s" %
                              (len(self.agencies_df), "agencies", "agency.txt"))
 
-        #fare_attr_dicts = []
-        #fare_rule_dicts = []
-        #for gtfs_fare_attr in gtfs_schedule.GetFareAttributeList():
-        #    fare_attr_dict = {}
-        #    for fieldname in gtfs_fare_attr._FIELD_NAMES:
-        #        if fieldname in gtfs_fare_attr.__dict__:
-        #            fare_attr_dict[fieldname] = gtfs_fare_attr.__dict__[fieldname]
-        #    fare_attr_dicts.append(fare_attr_dict)
-        #
-        #    for gtfs_fare_rule in gtfs_fare_attr.GetFareRuleList():
-        #        fare_rule_dict = {}
-        #        for fieldname in gtfs_fare_rule._FIELD_NAMES:
-        #            if fieldname in gtfs_fare_rule.__dict__:
-        #                fare_rule_dict[fieldname] = gtfs_fare_rule.__dict__[fieldname]
-        #        fare_rule_dicts.append(fare_rule_dict)
-        #
-        #self.fare_attrs_df = pandas.DataFrame(data=fare_attr_dicts)
         self.fare_attrs_df = gtfs.fare_attributes
 
         FastTripsLogger.debug("=========== FARE ATTRIBUTES ===========\n" + str(self.fare_attrs_df.head()))
@@ -293,7 +254,6 @@ def __init__(self, input_dir, output_dir, gtfs, today, stops):
             self.fare_by_class = False
 
         # Fare rules (map routes to fare_id)
-        #self.fare_rules_df = pandas.DataFrame(data=fare_rule_dicts)
         self.fare_rules_df = gtfs.fare_rules
         if len(self.fare_rules_df) > 0:
             self.fare_ids_df = Util.add_numeric_column(self.fare_rules_df[[Route.FARE_RULES_COLUMN_FARE_ID]],

diff --git a/fasttrips/Stop.py b/fasttrips/Stop.py
@@ -79,19 +79,6 @@ def __init__(self, input_dir, output_dir, gtfs, today):
         # keep this for later
         self.output_dir       = output_dir
 
-        # Combine all gtfs Stop objects to a single pandas DataFrame
-        stop_dicts = []
-        #for gtfs_stop in gtfs_schedule.GetStopList():
-        #    for gtfs_trip in gtfs_stop.GetTrips():
-        #        if gtfs_trip.service_period.IsActiveOn(today.strftime("%Y%m%d"), date_object=today):
-        #            stop_dict = {}
-        #            for fieldname in gtfs_stop._FIELD_NAMES:
-        #                if fieldname in gtfs_stop.__dict__:
-        #                    stop_dict[fieldname] = gtfs_stop.__dict__[fieldname]
-        #            stop_dicts.append(stop_dict)
-        #            break
-
-        #self.stops_df = pandas.DataFrame(data=stop_dicts)
         self.stops_df = gtfs.stops
 
         FastTripsLogger.info("Read %7d %15s from %25d %25s" %

diff --git a/fasttrips/Transfer.py b/fasttrips/Transfer.py
@@ -99,21 +99,8 @@ def __init__(self, input_dir, output_dir, gtfs_feed):
         self.output_dir       = output_dir
 
         # Combine all gtfs Transfer objects to a single pandas DataFrame
-        #transfer_dicts = []
-        #for gtfs_transfer in gtfs_schedule.GetTransferList():
-        #    transfer_dict = {}
-        #    for fieldname in gtfs_transfer._FIELD_NAMES:
-        #        if fieldname in gtfs_transfer.__dict__:
-        #            transfer_dict[fieldname] = gtfs_transfer.__dict__[fieldname]
-        #    transfer_dicts.append(transfer_dict)
-        #self.transfers_df = gtfs_feed.transfers
-        #if len(transfer_dicts) > 0:
-        #    self.transfers_df = pandas.DataFrame(data=transfer_dicts)
         self.transfers_df = gtfs_feed.transfers
 
-        # these are strings - empty string should mean 0 min transfer time
-        #self.transfers_df.replace(to_replace={Transfer.TRANSFERS_COLUMN_MIN_TRANSFER_TIME:{"":"0"}},
-        #                              inplace=True)
         # make it numerical
         self.transfers_df[Transfer.TRANSFERS_COLUMN_MIN_TRANSFER_TIME] = \
             self.transfers_df[Transfer.TRANSFERS_COLUMN_MIN_TRANSFER_TIME].astype(float)
@@ -125,16 +112,6 @@ def __init__(self, input_dir, output_dir, gtfs_feed):
         # these are from transfers.txt so they don't involve lots
         self.transfers_df[Transfer.TRANSFERS_COLUMN_STOP_TO_STOP] = True
 
-        #else:
-        #    self.transfers_df = pandas.DataFrame(columns=[Transfer.TRANSFERS_COLUMN_FROM_STOP,
-        #                                                  Transfer.TRANSFERS_COLUMN_FROM_STOP_NUM,
-        #                                                  Transfer.TRANSFERS_COLUMN_TO_STOP,
-        #                                                  Transfer.TRANSFERS_COLUMN_TO_STOP_NUM,
-        #                                                  Transfer.TRANSFERS_COLUMN_TIME,
-        #                                                  Transfer.TRANSFERS_COLUMN_TIME_MIN])
-        #    # set this up as a boolean column
-        #    self.transfers_df[Transfer.TRANSFERS_COLUMN_STOP_TO_STOP] = True
-
         # Read the fast-trips supplemental transfers data file
         transfers_ft_df = pandas.read_csv(os.path.join(input_dir, Transfer.INPUT_TRANSFERS_FILE),
                                           skipinitialspace=True,

diff --git a/fasttrips/Trip.py b/fasttrips/Trip.py
@@ -242,49 +242,6 @@ def __init__(self, input_dir, output_dir, gtfs_feed, today, stops, routes, prepe
                              (len(self.vehicles_df), "vehicles", self.INPUT_VEHICLES_FILE))
 
         # Combine all gtfs Trip objects to a single pandas DataFrame
-        #trip_dicts      = []
-        #stop_time_dicts = []
-        #Only iterate through the active records for the day of the analysis
-        #for gtfs_trip in (gtfs_trip for gtfs_trip in gtfs_schedule.GetTripList()
-        #                  if gtfs_trip.service_period.IsActiveOn(today.strftime("%Y%m%d"), date_object=today)):
-        #    trip_dicts.append({field_name: gtfs_trip.__dict__[field_name] for field_name in gtfs_trip._REQUIRED_FIELD_NAMES})
-        #
-        #    # stop times
-        #    #   _REQUIRED_FIELD_NAMES = ['trip_id', 'arrival_time', 'departure_time',
-        #    #                            'stop_id', 'stop_sequence']
-        #    #   _OPTIONAL_FIELD_NAMES = ['stop_headsign', 'pickup_type',
-        #    #                            'drop_off_type', 'shape_dist_traveled', 'timepoint']
-        #    for gtfs_stop_time in gtfs_trip.GetStopTimes():
-        #        stop_time_dict = {}
-        #        stop_time_dict[Trip.STOPTIMES_COLUMN_TRIP_ID]         = gtfs_trip.__dict__[Trip.STOPTIMES_COLUMN_TRIP_ID]
-        #        stop_time_dict[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME]    = gtfs_stop_time.arrival_time
-        #        stop_time_dict[Trip.STOPTIMES_COLUMN_DEPARTURE_TIME]  = gtfs_stop_time.departure_time
-        #        stop_time_dict[Trip.STOPTIMES_COLUMN_STOP_ID]         = gtfs_stop_time.stop_id
-        #        stop_time_dict[Trip.STOPTIMES_COLUMN_STOP_SEQUENCE]   = gtfs_stop_time.stop_sequence
-        #        # optional fields
-        #        try:
-        #            stop_time_dict[Trip.STOPTIMES_COLUMN_HEADSIGN]            = gtfs_stop_time.stop_headsign
-        #        except:
-        #            pass
-        #        try:
-        #            stop_time_dict[Trip.STOPTIMES_COLUMN_PICKUP_TYPE]         = gtfs_stop_time.pickup_type
-        #        except:
-        #            pass
-        #        try:
-        #            stop_time_dict[Trip.STOPTIMES_COLUMN_DROP_OFF_TYPE]        = gtfs_stop_time.drop_off_type
-        #        except:
-        #            pass
-        #        try:
-        #            stop_time_dict[Trip.STOPTIMES_COLUMN_SHAPE_DIST_TRAVELED] = gtfs_stop_time.shape_dist_traveled
-        #        except:
-        #            pass
-        #        try:
-        #            stop_time_dict[Trip.STOPTIMES_COLUMN_TIMEPOINT]           = gtfs_stop_time.timepoint
-        #        except:
-        #            pass
-        #        stop_time_dicts.append(stop_time_dict)
-
-        #self.trips_df = pandas.DataFrame(data=trip_dicts)
         self.trips_df = gtfs_feed.trips
         if len(self.trips_df) == 0:
             error_str = "No GTFS trips found for simulation day. Simulation day=%s" % (today.strftime("%B %d, %Y"))
@@ -374,18 +331,13 @@ def __init__(self, input_dir, output_dir, gtfs_feed, today, stops, routes, prepe
             Trip.STOPTIMES_COLUMN_DEPARTURE_TIME: Trip.STOPTIMES_COLUMN_DEPARTURE_TIME_MIN,
         }, inplace=True)
 
+        # float version
         self.stop_times_df[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME_MIN] = \
             self.stop_times_df[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME_MIN] / 60
 
         self.stop_times_df[Trip.STOPTIMES_COLUMN_DEPARTURE_TIME_MIN] = \
             self.stop_times_df[Trip.STOPTIMES_COLUMN_DEPARTURE_TIME_MIN] / 60
-        # float version
-        #self.stop_times_df[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME_MIN] = \
-        #    self.stop_times_df[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME].map(lambda x: \
-        #        60*x.time().hour + x.time().minute + x.time().second/60.0 )
-        #self.stop_times_df[Trip.STOPTIMES_COLUMN_DEPARTURE_TIME_MIN] = \
-        #    self.stop_times_df[Trip.STOPTIMES_COLUMN_DEPARTURE_TIME].map(lambda x: \
-        #        60*x.time().hour + x.time().minute + x.time().second/60.0 )
+
 
         # datetime version
         self.stop_times_df[Trip.STOPTIMES_COLUMN_ARRIVAL_TIME] = \