lint and format code post-template alignment

examples/02a_tabular_read_write.ipynb

@@ -33,7 +33,6 @@
     "import os\n",
     "\n",
     "import pandas as pd\n",
-    "\n",
     "from pam import read"
    ]
   },

examples/03_read_modify_write.ipynb

@@ -46,7 +46,6 @@
     "import geopandas as gp\n",
     "import pandas as pd\n",
     "from matplotlib import pyplot as plt\n",
-    "\n",
     "from pam import policy, read\n",
     "from pam.policy import apply_policies\n",
     "\n",

examples/04_point_sampling.ipynb

@@ -34,7 +34,6 @@
     "import geopandas as gp\n",
     "import pandas as pd\n",
     "from matplotlib import pyplot as plt\n",
-    "\n",
     "from pam import read\n",
     "from pam.samplers.spatial import RandomPointSampler"
    ]

examples/05_activity_plots.ipynb

@@ -30,7 +30,6 @@
     "import os\n",
     "\n",
     "import pandas as pd\n",
-    "\n",
     "from pam import read\n",
     "from pam.plot.stats import plot_activity_times, plot_leg_times"
    ]

examples/07_travel_survey_to_matsim.ipynb

@@ -49,7 +49,6 @@
     "\n",
     "import geopandas as gp\n",
     "import pandas as pd\n",
-    "\n",
     "from pam import read, write\n",
     "from pam.core import Population\n",
     "from pam.plot.stats import plot_activity_times, plot_leg_times\n",

examples/08_toy_matsim_population.ipynb

@@ -64,7 +64,6 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "import pandas as pd\n",
-    "\n",
     "from pam.activity import Activity, Leg\n",
     "from pam.core import Household, Person, Population\n",
     "from pam.plot.stats import plot_activity_times\n",

examples/10_advanced_spatial_sampling.ipynb

@@ -75,14 +75,13 @@
     "import geopandas as gp\n",
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
-    "import pandas as pd\n",
-    "from shapely.geometry import Point, Polygon\n",
-    "\n",
     "import pam\n",
+    "import pandas as pd\n",
     "from pam.activity import Activity, Leg\n",
     "from pam.core import Household, Person, Population\n",
     "from pam.samplers import facility\n",
-    "from pam.utils import minutes_to_datetime"
+    "from pam.utils import minutes_to_datetime\n",
+    "from shapely.geometry import Point, Polygon"
    ]
   },
   {

examples/13_Advanced_Freight_Synthesis.ipynb

@@ -40,7 +40,6 @@
     "import numpy as np\n",
     "import pandas as pd\n",
     "from matplotlib import pyplot as plt\n",
-    "\n",
     "from pam.core import Household, Person, Population\n",
     "from pam.samplers import tour\n",
     "from pam.samplers.facility import FacilitySampler\n",

examples/14_Advanced_Plan_Cropping.ipynb

@@ -38,13 +38,12 @@
     "\n",
     "import geopandas as gp\n",
     "import matplotlib.pyplot as plt\n",
-    "from shapely.geometry import Point, Polygon\n",
-    "\n",
     "from pam.activity import Activity, Leg, Plan\n",
     "from pam.core import Household, Person, Population\n",
     "from pam.operations import cropping\n",
     "from pam.utils import minutes_to_datetime as mtdt\n",
-    "from pam.variables import END_OF_DAY"
+    "from pam.variables import END_OF_DAY\n",
+    "from shapely.geometry import Point, Polygon"
    ]
   },
   {

examples/15_advanced_choice_modelling.ipynb

@@ -42,12 +42,11 @@
     "\n",
     "import numpy as np\n",
     "import pandas as pd\n",
-    "from prettytable import PrettyTable\n",
-    "\n",
     "from pam.operations.cropping import link_population\n",
     "from pam.planner import choice_location as choice\n",
     "from pam.planner.od import ODFactory, ODMatrix\n",
     "from pam.read import read_matsim\n",
+    "from prettytable import PrettyTable\n",
     "\n",
     "logging.basicConfig(level=logging.DEBUG)\n",
     "random.seed(0)"

examples/17_advanced_discretionary_locations.ipynb

@@ -40,16 +40,15 @@
     "\n",
     "import numpy as np\n",
     "import pandas as pd\n",
-    "from prettytable import PrettyTable\n",
-    "from shapely.geometry import Point\n",
-    "\n",
     "from pam.activity import Activity, Leg, Plan\n",
     "from pam.location import Location\n",
     "from pam.planner.choice_location import DiscretionaryTripOD, DiscretionaryTrips\n",
     "from pam.planner.od import ODFactory, ODMatrix\n",
     "from pam.planner.utils_planner import get_trip_chains_either_anchor\n",
     "from pam.utils import minutes_to_datetime as mtdt\n",
     "from pam.variables import END_OF_DAY\n",
+    "from prettytable import PrettyTable\n",
+    "from shapely.geometry import Point\n",
     "\n",
     "logging.getLogger(\"pam\").setLevel(logging.DEBUG)\n",
     "random.seed(0)"

examples/18_advanced_ipf.ipynb

@@ -35,7 +35,6 @@
     "import itertools\n",
     "\n",
     "import pandas as pd\n",
-    "\n",
     "from pam.core import Person, Population\n",
     "from pam.planner import ipf"
    ]

src/pam/operations/cropping.py

@@ -1,4 +1,5 @@
 """Methods for cropping plans outside core areas."""
+
 from typing import List
 
 from shapely.geometry import LineString, Polygon

src/pam/planner/choice_location.py

@@ -1,4 +1,5 @@
 """Location and mode choice models for activity modelling."""
+
 import itertools
 import logging
 from abc import ABC, abstractmethod

src/pam/planner/od.py

@@ -1,4 +1,5 @@
 """Manages origin-destination data required by the planner module."""
+
 import itertools
 from typing import NamedTuple, Union
 

tests/conftest.py

@@ -5,15 +5,14 @@
 import numpy as np
 import pandas as pd
 import pytest
-from shapely.geometry import Point
-
 from pam import read
 from pam.activity import Activity, Leg, Plan
 from pam.core import Household, Person, Population
 from pam.location import Location
 from pam.planner.od import OD, ODFactory, ODMatrix
 from pam.utils import minutes_to_datetime as mtdt
 from pam.variables import END_OF_DAY
+from shapely.geometry import Point
 
 TEST_DATA_DIR = Path(__file__).parent / "test_data"
 FIXTURES_DIR = importlib_resources.files("pam") / "fixtures"

tests/test_00_utils.py

@@ -5,14 +5,13 @@
 import pandas as pd
 import pytest
 from geopandas import GeoDataFrame
+from pam import utils
+from pam.core import Population
 from pandas import Timestamp
 from pandas.testing import assert_frame_equal
 from s2sphere import CellId
 from shapely.geometry import LineString
 
-from pam import utils
-from pam.core import Population
-
 
 @pytest.fixture()
 def correct_pt_person_geodataframe():

tests/test_01_core.py

@@ -1,7 +1,6 @@
 from datetime import datetime, timedelta
 
 import pytest
-
 from pam import PAMSequenceValidationError, PAMTimesValidationError, PAMValidationLocationsError
 from pam.activity import Activity, Leg
 from pam.core import Household, Person, Population

tests/test_01_core_operations.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity, Leg
 from pam.core import Household, Person, Population
 

tests/test_01_core_sample_locs.py

@@ -1,9 +1,8 @@
 from random import random
 
-from shapely.geometry import Point
-
 from pam.core import Population
 from pam.location import Location
+from shapely.geometry import Point
 
 
 def test_assign_same_locs_to_household(SmithHousehold):

tests/test_02_activity.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity, Leg, Plan
 from pam.utils import minutes_to_datetime as mtdt
 

tests/test_02_activity_components.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 import pytest
-
 from pam.activity import Activity, Leg, Location, Plan
 from pam.utils import minutes_to_datetime as mtdt
 from pam.variables import END_OF_DAY

tests/test_02_activity_plan.py

@@ -1,7 +1,6 @@
 from datetime import timedelta
 
 import pytest
-
 from pam import PAMSequenceValidationError
 from pam.activity import Activity, Leg, Location, Plan
 from pam.utils import minutes_to_datetime as mtdt

tests/test_02_activity_trips.py

@@ -1,7 +1,6 @@
 import pytest
-from shapely import Point
-
 from pam.activity import Activity, Leg, Plan, Trip
+from shapely import Point
 
 
 @pytest.mark.parametrize(

tests/test_02_activity_validate.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam import PAMSequenceValidationError, PAMTimesValidationError, PAMValidationLocationsError
 from pam.activity import Activity, Leg, Plan
 from pam.core import Person

tests/test_03_read.py

@@ -2,7 +2,6 @@
 
 import pandas as pd
 import pytest
-
 from pam.core import Household, Population
 from pam.read import load_pickle, load_travel_diary
 

tests/test_03_read_activity_plan.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import pytest
-
 from pam.read import trip_based_travel_diary_read
 
 test_activities_path = pytest.test_data_dir / "test_activity_plans.csv"

tests/test_03_read_challenge.py

@@ -1,6 +1,5 @@
 import pandas as pd
 import pytest
-
 from pam.read import load_travel_diary
 
 test_trips_path = pytest.test_data_dir / "simple_travel_diaries.csv"

tests/test_03_read_matsim.py

@@ -1,6 +1,5 @@
 import pytest
 from lxml import etree as et
-
 from pam.activity import Plan
 from pam.read import (
     get_attributes_from_person,

tests/test_03_read_travel_diary.py

@@ -2,7 +2,6 @@
 
 import pandas as pd
 import pytest
-
 from pam import PAMValidationLocationsError
 from pam.core import Person
 from pam.read import build_population, load_travel_diary

tests/test_04_household_policies.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity, Leg
 from pam.core import Household, Person, Population
 from pam.policy import policies, probability_samplers

tests/test_05_filters.py

@@ -1,7 +1,6 @@
 from random import choice
 
 import pytest
-
 from pam.activity import Activity
 from pam.core import Household, Person
 from pam.policy.filters import PersonAttributeFilter

tests/test_05_modifiers_AddActivity.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity
 from pam.policy import modifiers
 from pam.utils import minutes_to_datetime as mtdt

tests/test_05_modifiers_MoveActivity.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity, Plan
 from pam.policy.modifiers import MoveActivityTourToHomeLocation
 from pam.utils import minutes_to_datetime as mtdt

tests/test_05_modifiers_ReduceSharedActivity.py

@@ -1,7 +1,6 @@
 import random
 
 import pytest
-
 from pam.activity import Activity, Leg
 from pam.core import Person
 from pam.policy import modifiers

tests/test_05_modifiers_RemoveActivity.py

@@ -1,5 +1,4 @@
 import pytest
-
 from pam.activity import Activity
 from pam.policy import modifiers
 

tests/test_05_policies.py

@@ -1,7 +1,6 @@
 import random
 
 import pytest
-
 from pam.activity import Activity, Leg
 from pam.core import Person
 from pam.policy import filters, modifiers, policies, probability_samplers

tests/test_05_policy_levels.py

@@ -1,7 +1,6 @@
 import random
 
 import pytest
-
 from pam.activity import Activity
 from pam.policy import filters, modifiers, policies, probability_samplers
 from pam.utils import minutes_to_datetime as mtdt

tests/test_05_probability_samplers.py

@@ -1,7 +1,6 @@
 import random
 
 import pytest
-
 from pam.activity import Activity
 from pam.core import Household, Person
 from pam.policy import probability_samplers

tests/test_08_write.py

@@ -6,15 +6,14 @@
 import lxml
 import pandas as pd
 import pytest
-from shapely.geometry import Point
-
 from pam import write
 from pam.activity import Activity, Leg
 from pam.core import Household, Person, Population
 from pam.read import read_matsim
 from pam.utils import minutes_to_datetime as mtdt
 from pam.variables import END_OF_DAY
 from pam.write import Writer, write_matsim, write_matsim_population_v6, write_od_matrices
+from shapely.geometry import Point
 
 
 def test_writer_enters(tmp_path):

tests/test_09_samplers.py

@@ -4,6 +4,7 @@
 import geopandas as gp
 import pandas as pd
 import pytest
+from pam.samplers import attributes, basic, facility, spatial
 from shapely.geometry import (
     LinearRing,
     LineString,
@@ -14,8 +15,6 @@
     Polygon,
 )
 
-from pam.samplers import attributes, basic, facility, spatial
-
 
 @pytest.fixture
 def michael():

tests/test_09_samplers_tour.py

@@ -4,12 +4,11 @@
 import pandas as pd
 import pytest
 from matplotlib.figure import Figure
-from shapely.geometry import Point, Polygon
-
 from pam.core import Person
 from pam.samplers import tour
 from pam.samplers.facility import FacilitySampler
 from pam.variables import END_OF_DAY
+from shapely.geometry import Point, Polygon
 
 # %% Test input data