r5py 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

r5py/__init__.py

@@ -2,7 +2,7 @@
 
 """Python wrapper for the R5 routing analysis engine."""
 
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 
 from .r5 import (

r5py/r5/__init__.py

@@ -3,7 +3,6 @@
 """R5 classes."""
 
 from .access_leg import AccessLeg
-from .breakdown_stat import BreakdownStat
 from .detailed_itineraries import DetailedItineraries, DetailedItinerariesComputer
 from .direct_leg import DirectLeg
 from .egress_leg import EgressLeg
@@ -21,7 +20,6 @@ from .trip_planner import TripPlanner
 
 __all__ = [
     "AccessLeg",
-    "BreakdownStat",
     "DetailedItineraries",
     "DetailedItinerariesComputer",
     "DirectLeg",

r5py/r5/regional_task.py

@@ -45,7 +45,6 @@ class RegionalTask:
         speed_cycling=12.0,
         max_public_transport_rides=8,
         max_bicycle_traffic_stress=3,
-        breakdown=False,
     ):
         """
         Create a RegionalTask, a computing request for R5.
@@ -110,8 +109,6 @@ class RegionalTask:
         max_bicycle_traffic_stress : int
             Maximum stress level for cyclist routing, ranges from 1-4 see
             https://docs.conveyal.com/learn-more/traffic-stress Default: 3
-        breakdown : bool
-            Compute a more detailed breakdown of the routes. Default: False
         """
         self._regional_task = com.conveyal.r5.analyst.cluster.RegionalTask()
         self.scenario = Scenario()
@@ -149,8 +146,6 @@ class RegionalTask:
 
         # always record travel times
         self._regional_task.recordTimes = True
-        # also report paths, if `breakdown`
-        self.breakdown = breakdown
 
         # a few settings we don’t expose (yet?)
         self._regional_task.makeTauiSite = False
@@ -185,32 +180,6 @@ class RegionalTask:
             access_modes, com.conveyal.r5.api.util.LegMode
         )
 
-    @property
-    def breakdown(self):
-        """Compute a more detailed breakdown of the routes."""
-        return self._breakdown
-
-    @breakdown.setter
-    def breakdown(self, breakdown):
-        self._breakdown = breakdown
-        self._regional_task.includePathResults = breakdown
-
-        # R5 has a maximum number of destinations for which it returns detailed
-        # information, and it’s set to 5000 by default.
-        # The value is a static property of com.conveyal.r5.analyst.cluster.PathResult;
-        # static properites of Java classes can be modified in a singleton kind of way
-        try:
-            num_destinations = len(self.destinations)
-        except AttributeError:
-            num_destinations = 0
-        if (
-            num_destinations
-            > com.conveyal.r5.analyst.cluster.PathResult.MAX_PATH_DESTINATIONS
-        ):
-            com.conveyal.r5.analyst.cluster.PathResult.MAX_PATH_DESTINATIONS = (
-                num_destinations + 1
-            )
-
     @property
     def departure(self):
         """Find public transport connections leaving within ``departure_time_window`` after ``departure`` (datetime.datetime)."""

{r5py-1.0.1.dist-info → r5py-1.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: r5py
-Version: 1.0.1
+Version: 1.0.2
 Summary: Python wrapper for the R5 routing analysis engine
 Author: Christoph Fink, Willem Klumpenhouwer, Marcus Sairava, Rafael Pereira, Henrikki Tenkanen
 License: GPL-3.0-or-later or MIT

{r5py-1.0.1.dist-info → r5py-1.0.2.dist-info}/RECORD

@@ -1,14 +1,13 @@
-r5py/__init__.py,sha256=G4_W_JrAJL28AYFzW0kImNgE-wAfjb15kpCwQulRuNc,546
+r5py/__init__.py,sha256=weod_rATJoxiJHVbp-3NUPqhLH9TG7PgN85tKfzgv-g,546
 r5py/__main__.py,sha256=Wvn0ChD7E-dCSZ8b8k_HhHG0KMOk0qMNFkijGuSH3-0,81
-r5py/r5/__init__.py,sha256=6IQpvStxKeNxflizfRWh05USpdM18KBSB3UZ8Z_cGY4,1124
+r5py/r5/__init__.py,sha256=BVEeEVc-uUHLPLYBq1LN4exiQIHDw4YyANxNrprb8jQ,1061
 r5py/r5/access_leg.py,sha256=W3GfPEpqmWD1c4xipd6UcVIaBC-yb6srGCZV30E2dPY,293
 r5py/r5/base_travel_time_matrix.py,sha256=Vl82Wkk2iANNy6L3r937yXNnQ9lmMOErGT_-fQnb1Ms,6978
-r5py/r5/breakdown_stat.py,sha256=ZQkWA0hXlcRH3KVgtxPSNHP0FUDri8MWqdFk8EUdDMU,533
 r5py/r5/detailed_itineraries.py,sha256=Oo8JnF5jM2FsYFR1ma9r4y3evOmU7itDYs5M4vbqrZo,11245
 r5py/r5/direct_leg.py,sha256=T7wX8puhOVIssCpflXthYs-G9OA8pasFbdz9p8k8teg,1054
 r5py/r5/egress_leg.py,sha256=9rsCIcwlZUzoZE6q4imNY3VWpjJepO1IJvheVrlPi90,297
 r5py/r5/isochrones.py,sha256=NNpV3Df4NeLdDksGERkb2Eos33ziMBGEeaWyCKPt5P8,12974
-r5py/r5/regional_task.py,sha256=wTNx2NT3-GCEvDyz0e-_YYkVWtpE66dg2IlXTA1gI-4,23234
+r5py/r5/regional_task.py,sha256=EizNJCSQQ2fLDMTzDsq_pAVHBs1PPtwvSx8dt1t7pTo,22032
 r5py/r5/scenario.py,sha256=nUNAlN3cO7E_b4sMpNqdL0FD7WQaQ49iIvh-k8l4YRM,763
 r5py/r5/street_layer.py,sha256=2AWhIE0-aTNGQenX6bF1xv5bmhR_LV0CgqM4BKgVYfk,2329
 r5py/r5/street_segment.py,sha256=0O0QV8Eyfss-xHJShKGSQV1IusZfTrrxzu_AWl3KACo,1109
@@ -40,8 +39,8 @@ r5py/util/spatially_clustered_geodataframe.py,sha256=FxG8V3SSeK-PuCep565p1b3TNcl
 r5py/util/validating_requests_session.py,sha256=sH5FgpS9eGax5DG2qA2GrGuiwgTJgh8tKsZ9OiXKmvk,1807
 r5py/util/warnings.py,sha256=CvxKWKlNO_p3riB4SkNqbU5AGPsaY_3-OzqaBObE3B8,139
 r5py/util/working_copy.py,sha256=sbLbRCi39LtC-0tXxvh2y7ZN2D15chbhleCZXzHAFSc,1432
-r5py-1.0.1.dist-info/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
-r5py-1.0.1.dist-info/METADATA,sha256=URprsHGGXPJ0Ve6vCwJHw7R4iEZ7d7y84fJvmNdTrV4,9954
-r5py-1.0.1.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-r5py-1.0.1.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
-r5py-1.0.1.dist-info/RECORD,,
+r5py-1.0.2.dist-info/LICENSE,sha256=VAnuGDX1TPylSN9G2xLa-urDpj_SQwn-qqs068dx4tk,51
+r5py-1.0.2.dist-info/METADATA,sha256=JDf3owvqgJStxW6jM_36mjJC8iqtapgfaiLvVFCxur8,9954
+r5py-1.0.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+r5py-1.0.2.dist-info/top_level.txt,sha256=fOH1R85dkNDOI7jkg-lIsl5CQIO4fE5X868K9dTqs9U,5
+r5py-1.0.2.dist-info/RECORD,,

r5py/r5/breakdown_stat.py

@@ -1,26 +0,0 @@
-#!/usr/bin/env python3
-
-"""Wraps a com.conveyal.r5.analyst.cluster.PathResult.Stat enum set."""
-
-import enum
-
-from ..util import start_jvm
-
-import com.conveyal.r5
-
-
-__all__ = ["BreakdownStat"]
-
-
-start_jvm()
-
-
-class BreakdownStat(enum.Enum):
-    """
-    Statistical functions to apply to detailed routing results summary.
-
-    BreakdownStat.MEAN, BreakdownStat.MINIMUM
-    """
-
-    MEAN = com.conveyal.r5.analyst.cluster.PathResult.Stat.valueOf("MEAN")
-    MINIMUM = com.conveyal.r5.analyst.cluster.PathResult.Stat.valueOf("MINIMUM")