Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 191 #200

Closed
wants to merge 3 commits into from
Closed

Issue 191 #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d856350
Addresses issue 191
pedrocamargo Dec 28, 2020
a432f03
Addresses issue 191
pedrocamargo Dec 28, 2020
f99bcae
Merge branch 'version_07_dev' of github.com:AequilibraE/aequilibrae i…
pedrocamargo Jan 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions aequilibrae/parameters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,8 @@ osm:

system:
cpus: 0
default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt
driving side: right
default_directory: C:\
logging: true
logging_directory: /temp/
spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64
spatialite_path: C:\mod_spatialite-NG-win-amd64
temp directory: /temp
1 change: 1 addition & 0 deletions aequilibrae/project/about.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def create(self):
if cursor.fetchone()[0] is None:
cursor.execute(f"UPDATE 'about' set infovalue='{release_version}' where infoname='aequilibrae_version'")
cursor.execute(f"UPDATE 'about' set infovalue='{uuid.uuid4().hex}' where infoname='project_ID'")
cursor.execute("UPDATE 'about' set infovalue='right' where infoname='driving_side'")
self.__conn.commit()

self.__load()
Expand Down
5 changes: 4 additions & 1 deletion aequilibrae/project/database_specification/tables/about.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ INSERT INTO 'about' (infoname) VALUES('aequilibrae_version');
--#
INSERT INTO 'about' (infoname) VALUES('projection');

--#
INSERT INTO 'about' (infoname) VALUES('driving_side');

--#
INSERT INTO 'about' (infoname) VALUES('license');

--#
INSERT INTO 'about' (infoname) VALUES('scenario_name');
INSERT INTO 'about' (infoname) VALUES('scenario_name');
4 changes: 2 additions & 2 deletions tests/data/SiouxFalls_project/parameters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,9 +191,9 @@ network:
unknown_tags: true
system:
cpus: 0
default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt
default_directory: C:\
driving side: right
logging: true
logging_directory: /temp/
spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64
spatialite_path: C:\mod_spatialite-NG-win-amd64
temp directory: /temp
4 changes: 2 additions & 2 deletions tests/data/no_triggers_project/parameters.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,9 @@ network:
unknown_tags: true
system:
cpus: 0
default_directory: C:\Users\pedro.camargo\Documents\sourcecode\drt
default_directory: C:\
driving side: right
logging: true
logging_directory: D:/no_triggers_project
spatialite_path: C:\Users\pedro\Documents\mod_spatialite-NG-win-amd64
spatialite_path: C:\mod_spatialite-NG-win-amd64
temp directory: /temp