Skip to content

Commit

Permalink
Merge branch '0.2.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Billy Charlton committed Jun 5, 2024
2 parents 4cd5c54 + 4c16429 commit 005754f
Show file tree
Hide file tree
Showing 201 changed files with 3,574 additions and 1,499 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ Makefile
^_pkgdown\.yml$
^docs$
^pkgdown$
^doc$
^Meta$
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,8 @@ kelheim/
test/
dashboard_test/
.sentinel*
inst/doc
.idea
inst/doc
/doc/
/Meta/

14 changes: 7 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
Package: matsim
Type: Package
Title: R library for interfacing with MATSim agent-based microsimulation model
Version: 0.2.0
Version: 0.2.1
Authors@R: c(
person("Billy", "Charlton", email = "[email protected]", role=c("aut","cre")),
person("Oleksandr", "Soboliev", role="aut"))
person("Oleksandr", "Soboliev", role="aut"),
person("Johanna", "Bänsch", role = "aut"))
Description: MATSim support package for R
MATSim <https://matsim.org> is an agent-based microsimulation package
for large-scale transport simulations. This package mimics the functionality
of the Python matsim-tools package, and thus supports reading standard
MATSim networks and soon, plans and events as well.
of the Python matsim-tools package.
.
Developed with support from the Technische Universität Berlin's
Developed with support from the Tecbrowhnische Universität Berlin's
VSP Transport Planning and Transport Telematics department.
.
This project is under ongoing development and submissions are welcome!
This project is under ongoing development and submissions are welcome!
License: GPL (>= 3)
Encoding: UTF-8
Imports:
Expand All @@ -40,7 +40,7 @@ Imports:
LazyData: true
URL: https://github.com/matsim-vsp/matsim-r
BugReports: https://github.com/matsim-vsp/matsim-r/issues
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Suggests:
knitr,
rmarkdown,
Expand Down
7 changes: 7 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ export(plotModalShiftBar)
export(plotModalShiftSankey)
export(plotModalSplitBarChart)
export(plotModalSplitPieChart)
export(plotStartActCountByDepTime)
export(plotTripCountByDepTime)
export(plotTripDistanceByMode)
export(plotTripDistancedByType)
Expand All @@ -37,6 +38,7 @@ export(plot_compare_mainmode_sankey)
export(plot_compare_score_boxplot)
export(plot_compare_travelwaittime_by_mainmode)
export(plot_compare_travelwaittime_by_mainmode_barchart)
export(plot_count_scatterplot)
export(plot_deptime_by_act)
export(plot_distance_by_mainmode_barchart)
export(plot_distance_by_spatialcat_barchart)
Expand All @@ -59,17 +61,22 @@ export(process_convert_table_to_sf)
export(process_convert_time)
export(process_filter_by_shape)
export(process_get_crs_from_config)
export(process_get_dtv_distribution_by_linktype)
export(process_get_dtv_estimation_quality)
export(process_get_mainmode_distribution)
export(process_get_od_matrix)
export(process_get_travdistance_distribution)
export(process_get_travelwaittime_by_mainmode)
export(process_join_counts_and_links)
export(process_rename_category)
export(process_rename_mainmodes)
export(readCounts)
export(readLinkStats)
export(readPersonsTable)
export(readTripsTable)
export(read_config)
export(read_counts)
export(read_linkstats)
export(read_network)
export(read_output_persons)
export(read_output_trips)
Expand Down
Loading

0 comments on commit 005754f

Please sign in to comment.