diff --git a/src/__init__.py b/bikedna/__init__.py similarity index 100% rename from src/__init__.py rename to bikedna/__init__.py diff --git a/src/evaluation_functions.py b/bikedna/evaluation_functions.py similarity index 100% rename from src/evaluation_functions.py rename to bikedna/evaluation_functions.py diff --git a/src/graph_functions.py b/bikedna/graph_functions.py similarity index 100% rename from src/graph_functions.py rename to bikedna/graph_functions.py diff --git a/src/matching_functions.py b/bikedna/matching_functions.py similarity index 100% rename from src/matching_functions.py rename to bikedna/matching_functions.py diff --git a/src/plotting_functions.py b/bikedna/plotting_functions.py similarity index 100% rename from src/plotting_functions.py rename to bikedna/plotting_functions.py diff --git a/src/simplification_functions.py b/bikedna/simplification_functions.py similarity index 100% rename from src/simplification_functions.py rename to bikedna/simplification_functions.py diff --git a/environment_used.yml b/environment_used.yml new file mode 100644 index 0000000..5acfaef --- /dev/null +++ b/environment_used.yml @@ -0,0 +1,18 @@ +name: bikedna +channels: + - conda-forge + - defaults +dependencies: + - networkx + - ipykernel + - momepy + - folium + - jupyterlab + - geopandas + - osmnx + - pyyaml + - contextily + - pandas + - matplotlib + - haversine + - nbconvert \ No newline at end of file diff --git a/scripts/COMPARE/3a_extrinsic_analysis_metrics.ipynb b/scripts/COMPARE/3a_extrinsic_analysis_metrics.ipynb index 0f182c9..8f48447 100644 --- a/scripts/COMPARE/3a_extrinsic_analysis_metrics.ipynb +++ b/scripts/COMPARE/3a_extrinsic_analysis_metrics.ipynb @@ -109,9 +109,9 @@ "from matplotlib import cm\n", "from collections import Counter\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import graph_functions as graph_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import graph_functions as graph_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "# Read in dictionaries with settings\n", "%run ../settings/yaml_variables.py\n", @@ -1819,7 +1819,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0" + "version": "3.12.3" }, "vscode": { "interpreter": { diff --git a/scripts/COMPARE/3b_extrinsic_analysis_feature_matching.ipynb b/scripts/COMPARE/3b_extrinsic_analysis_feature_matching.ipynb index ff7246a..f7b9f5b 100644 --- a/scripts/COMPARE/3b_extrinsic_analysis_feature_matching.ipynb +++ b/scripts/COMPARE/3b_extrinsic_analysis_feature_matching.ipynb @@ -101,9 +101,9 @@ "import yaml\n", "import numpy as np\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import matching_functions as match_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import matching_functions as match_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "# Read in dictionaries with settings\n", "%run ../settings/yaml_variables.py\n", @@ -1146,7 +1146,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0" + "version": "3.12.3" }, "vscode": { "interpreter": { diff --git a/scripts/OSM/1a_initialize_osm.ipynb b/scripts/OSM/1a_initialize_osm.ipynb index 43ab42b..bf4ccc1 100644 --- a/scripts/OSM/1a_initialize_osm.ipynb +++ b/scripts/OSM/1a_initialize_osm.ipynb @@ -82,7 +82,7 @@ "
\n", "Troubleshooting\n", "

\n", - "If in the cell below the functions located in the src folder do not load properly: Check that pip install -e . was run successfully (see instructions in README.md).\n", + "If in the cell below the functions located in the bikedna folder do not load properly: Check that pip install -e . was run successfully (see instructions in README.md).\n", "

\n", "
" ] @@ -112,10 +112,10 @@ "import numpy as np\n", "import yaml\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import graph_functions as graph_func\n", - "from src import simplification_functions as simp_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import graph_functions as graph_func\n", + "from bikedna import simplification_functions as simp_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "%run ../settings/plotting.py\n", "%run ../settings/yaml_variables.py\n", diff --git a/scripts/OSM/1b_intrinsic_analysis_osm.ipynb b/scripts/OSM/1b_intrinsic_analysis_osm.ipynb index 23d7aac..829352b 100644 --- a/scripts/OSM/1b_intrinsic_analysis_osm.ipynb +++ b/scripts/OSM/1b_intrinsic_analysis_osm.ipynb @@ -110,8 +110,8 @@ "import yaml\n", "from matplotlib import cm, colors\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "%run ../settings/yaml_variables.py\n", "%run ../settings/plotting.py\n", @@ -2405,7 +2405,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0 | packaged by conda-forge | (main, Oct 25 2022, 06:24:51) [Clang 14.0.4 ]" + "version": "3.12.3" }, "vscode": { "interpreter": { diff --git a/scripts/REFERENCE/2a_initialize_reference.ipynb b/scripts/REFERENCE/2a_initialize_reference.ipynb index 063d30d..7648e40 100644 --- a/scripts/REFERENCE/2a_initialize_reference.ipynb +++ b/scripts/REFERENCE/2a_initialize_reference.ipynb @@ -80,7 +80,7 @@ "
\n", "Troubleshooting\n", "

\n", - "If in the cell below the functions located in the src folder do not load properly: Check that pip install -e . was run successfully (see instructions in README.md).\n", + "If in the cell below the functions located in the bikedna folder do not load properly: Check that pip install -e . was run successfully (see instructions in README.md).\n", "

\n", "
" ] @@ -107,10 +107,10 @@ "import osmnx as ox\n", "import numpy as np\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import graph_functions as graph_func\n", - "from src import simplification_functions as simp_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import graph_functions as graph_func\n", + "from bikedna import simplification_functions as simp_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "%run ../settings/plotting.py\n", "%run ../settings/yaml_variables.py\n", @@ -754,7 +754,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0 | packaged by conda-forge | (main, Oct 25 2022, 06:24:51) [Clang 14.0.4 ]" + "version": "3.12.3" }, "vscode": { "interpreter": { diff --git a/scripts/REFERENCE/2b_intrinsic_analysis_reference.ipynb b/scripts/REFERENCE/2b_intrinsic_analysis_reference.ipynb index 8ba2f29..4799288 100644 --- a/scripts/REFERENCE/2b_intrinsic_analysis_reference.ipynb +++ b/scripts/REFERENCE/2b_intrinsic_analysis_reference.ipynb @@ -104,8 +104,8 @@ "import yaml\n", "from matplotlib import cm, colors\n", "\n", - "from src import evaluation_functions as eval_func\n", - "from src import plotting_functions as plot_func\n", + "from bikedna import evaluation_functions as eval_func\n", + "from bikedna import plotting_functions as plot_func\n", "\n", "%run ../settings/yaml_variables.py\n", "%run ../settings/plotting.py\n", @@ -1588,7 +1588,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.0 | packaged by conda-forge | (main, Oct 25 2022, 06:24:51) [Clang 14.0.4 ]" + "version": "3.12.3" }, "vscode": { "interpreter": { diff --git a/scripts/examples/reference_data_preparation_01.ipynb b/scripts/examples/reference_data_preparation_01.ipynb index 7558840..dc0d05b 100644 --- a/scripts/examples/reference_data_preparation_01.ipynb +++ b/scripts/examples/reference_data_preparation_01.ipynb @@ -44,7 +44,7 @@ "import momepy\n", "from shapely.ops import linemerge\n", "\n", - "from src import plotting_functions as pf\n", + "from bikedna import plotting_functions as pf\n", "%run ../settings/tiledict.py" ] }, diff --git a/scripts/examples/reference_data_preparation_02.ipynb b/scripts/examples/reference_data_preparation_02.ipynb index fe84ebc..7806e45 100644 --- a/scripts/examples/reference_data_preparation_02.ipynb +++ b/scripts/examples/reference_data_preparation_02.ipynb @@ -45,8 +45,8 @@ "import momepy\n", "from shapely.ops import linemerge\n", "\n", - "from src import graph_functions as gf\n", - "from src import plotting_functions as pf\n", + "from bikedna import graph_functions as gf\n", + "from bikedna import plotting_functions as pf\n", "\n", "%run ../settings/tiledict.py" ] diff --git a/scripts/settings/yaml_variables.py b/scripts/settings/yaml_variables.py index 2f26366..8ec5973 100644 --- a/scripts/settings/yaml_variables.py +++ b/scripts/settings/yaml_variables.py @@ -1,5 +1,5 @@ import yaml -from src import evaluation_functions as ef +from bikedna import evaluation_functions as ef with open(r"../../config.yml") as file: diff --git a/setup.py b/setup.py index 161f66e..34a88f7 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ from setuptools import find_packages, setup setup( - name="src", + name="bikedna", packages=find_packages(), -) +) \ No newline at end of file diff --git a/src.egg-info/PKG-INFO b/src.egg-info/PKG-INFO deleted file mode 100644 index 758a831..0000000 --- a/src.egg-info/PKG-INFO +++ /dev/null @@ -1,4 +0,0 @@ -Metadata-Version: 2.1 -Name: src -Version: 0.0.0 -License-File: LICENSE diff --git a/src.egg-info/SOURCES.txt b/src.egg-info/SOURCES.txt deleted file mode 100644 index 5059f57..0000000 --- a/src.egg-info/SOURCES.txt +++ /dev/null @@ -1,13 +0,0 @@ -LICENSE -README.md -setup.py -src/__init__.py -src/evaluation_functions.py -src/graph_functions.py -src/matching_functions.py -src/plotting_functions.py -src/simplification_functions.py -src.egg-info/PKG-INFO -src.egg-info/SOURCES.txt -src.egg-info/dependency_links.txt -src.egg-info/top_level.txt \ No newline at end of file diff --git a/src.egg-info/dependency_links.txt b/src.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/src.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src.egg-info/top_level.txt b/src.egg-info/top_level.txt deleted file mode 100644 index 85de9cf..0000000 --- a/src.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -src diff --git a/tests/test.py b/tests/test.py index b0a4cc5..8bbd373 100644 --- a/tests/test.py +++ b/tests/test.py @@ -9,10 +9,10 @@ from shapely.geometry import LineString, Polygon, Point, MultiLineString import math -from src import evaluation_functions as ef +from bikedna import evaluation_functions as ef -from src import matching_functions as mf -from src import graph_functions as gf +from bikedna import matching_functions as mf +from bikedna import graph_functions as gf #%% ###################### TESTS FOR EVALUATION FUNCTIONS #############################