Menu
▾
▴
[transims-commits] SF.net SVN: transims:[1717] version7/branches/aecom/Transims70
|
From: subversion c. n. <tra...@li...> - 2019-04-05 20:12:16
|
Revision: 1717
http://sourceforge.net/p/transims/code/1717
Author: davidroden
Date: 2019-04-05 20:12:11 +0000 (Fri, 05 Apr 2019)
Log Message:
-----------
TRANSIMS Version 7.3 from AECOM branch 1716
SysLib
The Field_Number method was expanded to accept a list of fields names. The logic used to write time data has short binary integers was modified to store rounded seconds rather than decimal seconds. Additional options for water-based travel were added to the facility type, use restrictions, transit mode and trip mode fields. MIDNIGHT and N/A options were added to the time value input options. An additional Sub_Shape method was added to extract a shape between two near-by points.
File_Service
Set_System_File method was added to re-direct the system file processing logic to an additional data file. Origin and Destination fields were added to the default data fields within a Location data file. A new Service Summary File was added for transit route generation. A Node field was added to the Transit Stop file as an alternative to the link-offset location method.
Data_Service
A new Service Summary Data structure was added. Transit Stop processing includes logic for the Node field option. The Transit Driver processing includes logic for stop nodes.
ArcNet 7.3.3
Additional logic was added to improve Transit Driver vehicle and route type mapping. Route and Stop drawing include logic for node-based transit stops. Access link drawing no longer requires output of parking, location and transit stop shapefiles.
ArcRider 7.3.1
Additional name fields were included.
DynusTPrep 7.3.5
New program to convert DynusT networks and trajectory files to TRANSIMS format.
FileFormat 7.3.2
Multiple field name options can now be used to extract data within a user program from a data file.
GridData 7.3.1
LINK_DATA_FILTER control key was added to provide a range for link data processing.
GTFSData 7.3.1
Link and Node input files were made optional and new Link, Node and Shape files can be generated from the GTFS transit routes. When creating link records, the shape between two stops on each route is used. The stops are located at the node using the new transit stop data option. The new waterway options and modes are also used. The line processing logic was modified to base line generation on the route alignment rather than the head sign text.
LinkSum 7.3.1
The updated SysLib, File Service and Data Service logic was included.
LocationData 7.3.1
Logic was added to create a new Zone file coordinates from the centroid of the zone boundary polygons.
PlanSum 7.3.3
NEW_ZONE_SKIM_FILE/FORMAT keys were added to create zone skims from travel plans. Additional logic was added to the station transfer summaries.
PlanTrips 7.3.2
Logic was added to extract the origin-destination types and vehicle type data from the plan file.
RiderSum 7.3.1
Logic was added to the group route profiles to build the stop list from the line with the most stops rather than the lines in line number order.
RoutePrep 7.3.5
Logic was added to edit transit route or build new transit routes for line summary data. New control keys include SERVICE_SUMMARY_FILE, SERVICE_SUMMARY_FORMAT, NEW_SERVICE_SUMMARY_FILE, NEW_SERVICE_SUMMARY_FORMAT, BASE_ROUTE_FILE, BASE_SCHEDULE_FILE, BASE_DRIVER_FILE, SERVICE_PERIOD_STOP_FILE, MAXIMUM_AM_PEAK_PERIOD, MAXIMUM_PM_PEAK_PERIOD, EW_BASE_SCHEDULE_FILE, NEW_LINE_GROUP_FILE. Routes can be extended at the beginning or end of the route and stops can be added in the middle of routes. The new Service Summary file can be used to build new routes and schedules given beginning and ending stations and service periods, headways, and vehicle type shares using route templates by time of day.
Router 7.3.4
Optional compile keys can dump path trees in shapefile format. The node-based origin-destination plan building was enhanced.
TripPrep 7.3.3
New control keys include BASE_TRIP_FILE, BASE_TRIP_FORMAT, GROWTH_TRIP_FILE, GROWTH_TRIP_FORMAT, MINIMUM_GROWTH_FACTOR, and MAXIMUM_GROWTH_FACTOR to calculate origin and destination activity location growth factors from two trip files and apply those growth factors to a different trip file. This is primarily used to apply OD matrix adjustments based on traffic counts to a future year trip file.
TripSum 7.3.3
The logic was updated to calculate trip end totals based on fractional trip weights on each plan.
Modified Paths:
--------------
version7/branches/aecom/Transims70/AddLRSData/AddLRSData.vcxproj
version7/branches/aecom/Transims70/ArcJoin/ArcJoin.vcxproj
version7/branches/aecom/Transims70/ArcNet/ArcNet.cpp
version7/branches/aecom/Transims70/ArcNet/ArcNet.hpp
version7/branches/aecom/Transims70/ArcNet/ArcNet.vcxproj
version7/branches/aecom/Transims70/ArcNet/Control.cpp
version7/branches/aecom/Transims70/ArcNet/Draw_Driver.cpp
version7/branches/aecom/Transims70/ArcNet/Draw_Route.cpp
version7/branches/aecom/Transims70/ArcNet/Get_Location_Data.cpp
version7/branches/aecom/Transims70/ArcNet/Get_Parking_Data.cpp
version7/branches/aecom/Transims70/ArcNet/Get_Stop_Data.cpp
version7/branches/aecom/Transims70/ArcPerf/ArcPerf.vcxproj
version7/branches/aecom/Transims70/ArcPlan/ArcPlan.vcxproj
version7/branches/aecom/Transims70/ArcPlan/Get_Stop_Data.cpp
version7/branches/aecom/Transims70/ArcRider/ArcRider.cpp
version7/branches/aecom/Transims70/ArcRider/ArcRider.vcxproj
version7/branches/aecom/Transims70/ArcRider/Control.cpp
version7/branches/aecom/Transims70/ArcRider/Write_Riders.cpp
version7/branches/aecom/Transims70/ArcSnapshot/ArcSnapshot.vcxproj
version7/branches/aecom/Transims70/Converge_Service/Converge_Service.vcxproj
version7/branches/aecom/Transims70/ConvertTrips/ConvertTrips.vcxproj
version7/branches/aecom/Transims70/CountSum/CountSum.vcxproj
version7/branches/aecom/Transims70/Data_Service/Control.cpp
version7/branches/aecom/Transims70/Data_Service/Data_Service.cpp
version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj
version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj.filters
version7/branches/aecom/Transims70/Data_Service/Read_Connections.cpp
version7/branches/aecom/Transims70/Data_Service/Read_Drivers.cpp
version7/branches/aecom/Transims70/Data_Service/Read_Locations.cpp
version7/branches/aecom/Transims70/Data_Service/Read_Stops.cpp
version7/branches/aecom/Transims70/Data_Service/Write_Locations.cpp
version7/branches/aecom/Transims70/Data_Service/Write_Stops.cpp
version7/branches/aecom/Transims70/Draw_Service/Draw_Service.vcxproj
version7/branches/aecom/Transims70/EventSum/EventSum.vcxproj
version7/branches/aecom/Transims70/FileFormat/FileFormat.cpp
version7/branches/aecom/Transims70/FileFormat/FileFormat.vcxproj
version7/branches/aecom/Transims70/File_Service/Driver_File.cpp
version7/branches/aecom/Transims70/File_Service/File_Service.vcxproj
version7/branches/aecom/Transims70/File_Service/File_Service.vcxproj.filters
version7/branches/aecom/Transims70/File_Service/Line_File.cpp
version7/branches/aecom/Transims70/File_Service/Link_Data_File.cpp
version7/branches/aecom/Transims70/File_Service/Location_File.cpp
version7/branches/aecom/Transims70/File_Service/Stop_File.cpp
version7/branches/aecom/Transims70/Flow_Time_Service/Flow_Time_Service.vcxproj
version7/branches/aecom/Transims70/Fratar/Fratar.vcxproj
version7/branches/aecom/Transims70/GTFSData/Build_Routes.cpp
version7/branches/aecom/Transims70/GTFSData/Build_Shapes.cpp
version7/branches/aecom/Transims70/GTFSData/Control.cpp
version7/branches/aecom/Transims70/GTFSData/Draw_Routes.cpp
version7/branches/aecom/Transims70/GTFSData/Execute.cpp
version7/branches/aecom/Transims70/GTFSData/GTFSData.cpp
version7/branches/aecom/Transims70/GTFSData/GTFSData.hpp
version7/branches/aecom/Transims70/GTFSData/GTFSData.vcxproj
version7/branches/aecom/Transims70/GTFSData/GTFSData.vcxproj.filters
version7/branches/aecom/Transims70/GTFSData/GTFS_Data.hpp
version7/branches/aecom/Transims70/GTFSData/Read_Shapes.cpp
version7/branches/aecom/Transims70/GTFSData/Read_Stop_Times.cpp
version7/branches/aecom/Transims70/GTFSData/Read_Stops.cpp
version7/branches/aecom/Transims70/Gravity/Gravity.vcxproj
version7/branches/aecom/Transims70/GridData/Control.cpp
version7/branches/aecom/Transims70/GridData/GridData.cpp
version7/branches/aecom/Transims70/GridData/GridData.hpp
version7/branches/aecom/Transims70/GridData/GridData.vcxproj
version7/branches/aecom/Transims70/GridData/Link_Grid.cpp
version7/branches/aecom/Transims70/Include/Control_Service.hpp
version7/branches/aecom/Transims70/Include/Data_Service.hpp
version7/branches/aecom/Transims70/Include/File_Service.hpp
version7/branches/aecom/Transims70/Include/Location_File.hpp
version7/branches/aecom/Transims70/Include/Router_Service.hpp
version7/branches/aecom/Transims70/Include/Shape_Tools.hpp
version7/branches/aecom/Transims70/Include/Stop_Data.hpp
version7/branches/aecom/Transims70/Include/Stop_File.hpp
version7/branches/aecom/Transims70/Include/System_Defines.hpp
version7/branches/aecom/Transims70/Include/TypeDefs.hpp
version7/branches/aecom/Transims70/IntControl/IntControl.vcxproj
version7/branches/aecom/Transims70/LineSum/LineSum.vcxproj
version7/branches/aecom/Transims70/LinkData/LinkData.vcxproj
version7/branches/aecom/Transims70/LinkSum/LinkSum.cpp
version7/branches/aecom/Transims70/LinkSum/LinkSum.vcxproj
version7/branches/aecom/Transims70/LocationData/Control.cpp
version7/branches/aecom/Transims70/LocationData/Execute.cpp
version7/branches/aecom/Transims70/LocationData/LocationData.cpp
version7/branches/aecom/Transims70/LocationData/LocationData.hpp
version7/branches/aecom/Transims70/LocationData/LocationData.vcxproj
version7/branches/aecom/Transims70/LocationData/Read_Boundary.cpp
version7/branches/aecom/Transims70/MatrixData/MatrixData.vcxproj
version7/branches/aecom/Transims70/ModeChoice/ModeChoice.vcxproj
version7/branches/aecom/Transims70/NJFare2/NJFare2.vcxproj
version7/branches/aecom/Transims70/NetDiff/NetDiff.vcxproj
version7/branches/aecom/Transims70/NetFix/NetFix.vcxproj
version7/branches/aecom/Transims70/NetMerge/NetMerge.vcxproj
version7/branches/aecom/Transims70/NetPrep/NetPrep.vcxproj
version7/branches/aecom/Transims70/NewFormat/NewFormat.vcxproj
version7/branches/aecom/Transims70/NewLandUse/NewLandUse.vcxproj
version7/branches/aecom/Transims70/PNRSplit/PNRSplit.vcxproj
version7/branches/aecom/Transims70/PathSkim/PathSkim.vcxproj
version7/branches/aecom/Transims70/PerfPrep/PerfPrep.vcxproj
version7/branches/aecom/Transims70/PlanCompare/PlanCompare.vcxproj
version7/branches/aecom/Transims70/PlanPrep/PlanPrep.vcxproj
version7/branches/aecom/Transims70/PlanSelect/PlanSelect.vcxproj
version7/branches/aecom/Transims70/PlanSum/Control.cpp
version7/branches/aecom/Transims70/PlanSum/Execute.cpp
version7/branches/aecom/Transims70/PlanSum/PlanSum.cpp
version7/branches/aecom/Transims70/PlanSum/PlanSum.hpp
version7/branches/aecom/Transims70/PlanSum/PlanSum.vcxproj
version7/branches/aecom/Transims70/PlanSum/PlanSum.vcxproj.filters
version7/branches/aecom/Transims70/PlanSum/Plan_Processing.cpp
version7/branches/aecom/Transims70/PlanSum/Process_Plan.cpp
version7/branches/aecom/Transims70/PlanSum/Write_Details.cpp
version7/branches/aecom/Transims70/PlanSum/Write_Groups.cpp
version7/branches/aecom/Transims70/PlanTrips/PlanTrips.cpp
version7/branches/aecom/Transims70/PlanTrips/PlanTrips.vcxproj
version7/branches/aecom/Transims70/PlanTrips/Put_Trip_Data.cpp
version7/branches/aecom/Transims70/PlanTrips/Read_Plan.cpp
version7/branches/aecom/Transims70/ProblemSelect/ProblemSelect.vcxproj
version7/branches/aecom/Transims70/Progression/Progression.vcxproj
version7/branches/aecom/Transims70/Relocate/Relocate.vcxproj
version7/branches/aecom/Transims70/Reschedule/Reschedule.vcxproj
version7/branches/aecom/Transims70/RiderSum/Group_Rider_Report.cpp
version7/branches/aecom/Transims70/RiderSum/RiderSum.cpp
version7/branches/aecom/Transims70/RiderSum/RiderSum.vcxproj
version7/branches/aecom/Transims70/RiderSum/Write_Group_Rider.cpp
version7/branches/aecom/Transims70/RiderSum/Write_Stop_Group.cpp
version7/branches/aecom/Transims70/RiderSum/Write_Stop_VehTypes.cpp
version7/branches/aecom/Transims70/RoutePrep/Control.cpp
version7/branches/aecom/Transims70/RoutePrep/Execute.cpp
version7/branches/aecom/Transims70/RoutePrep/RoutePrep.cpp
version7/branches/aecom/Transims70/RoutePrep/RoutePrep.hpp
version7/branches/aecom/Transims70/RoutePrep/RoutePrep.vcxproj
version7/branches/aecom/Transims70/RoutePrep/RoutePrep.vcxproj.filters
version7/branches/aecom/Transims70/Router/Control.cpp
version7/branches/aecom/Transims70/Router/Execute.cpp
version7/branches/aecom/Transims70/Router/Router.cpp
version7/branches/aecom/Transims70/Router/Router.hpp
version7/branches/aecom/Transims70/Router/Router.vcxproj
version7/branches/aecom/Transims70/Router_Service/Build_Path.cpp
version7/branches/aecom/Transims70/Router_Service/Drive_Path.cpp
version7/branches/aecom/Transims70/Router_Service/Drive_Plan.cpp
version7/branches/aecom/Transims70/Router_Service/Execute.cpp
version7/branches/aecom/Transims70/Router_Service/Parking_Access.cpp
version7/branches/aecom/Transims70/Router_Service/Path_Builder.hpp
version7/branches/aecom/Transims70/Router_Service/Router_Service.cpp
version7/branches/aecom/Transims70/Router_Service/Router_Service.vcxproj
version7/branches/aecom/Transims70/Router_Service/Trace_Path.cpp
version7/branches/aecom/Transims70/Router_Service/Transit_Plan.cpp
version7/branches/aecom/Transims70/Select_Service/Select_Service.vcxproj
version7/branches/aecom/Transims70/SimSubareas/SimSubareas.vcxproj
version7/branches/aecom/Transims70/Simulator/Simulator.vcxproj
version7/branches/aecom/Transims70/Simulator_Service/Simulator_Service.vcxproj
version7/branches/aecom/Transims70/SubareaNet/SubareaNet.vcxproj
version7/branches/aecom/Transims70/SubareaPlans/SubareaPlans.vcxproj
version7/branches/aecom/Transims70/SysLib/Dbfile/Db_Base.cpp
version7/branches/aecom/Transims70/SysLib/Program/Get_Token.cpp
version7/branches/aecom/Transims70/SysLib/Service/Control_Service.cpp
version7/branches/aecom/Transims70/SysLib/Service/Execution_Service.cpp
version7/branches/aecom/Transims70/SysLib/Service/Static_Service.cpp
version7/branches/aecom/Transims70/SysLib/SysLib.vcxproj
version7/branches/aecom/Transims70/SysLib/Tools/Dtime.cpp
version7/branches/aecom/Transims70/SysLib/Tools/Shape_Tools.cpp
version7/branches/aecom/Transims70/SysLib/Tools/String.cpp
version7/branches/aecom/Transims70/SysLib/Tools/Time_Periods.cpp
version7/branches/aecom/Transims70/TcadLib/TcadLib.vcxproj
version7/branches/aecom/Transims70/TppLib/TppLib.vcxproj
version7/branches/aecom/Transims70/TransimsNet/TransimsNet.vcxproj
version7/branches/aecom/Transims70/TransitAccess/TransitAccess.vcxproj
version7/branches/aecom/Transims70/TransitNet/Control.cpp
version7/branches/aecom/Transims70/TransitNet/Data_Setup.cpp
version7/branches/aecom/Transims70/TransitNet/Execute.cpp
version7/branches/aecom/Transims70/TransitNet/Station_Access.cpp
version7/branches/aecom/Transims70/TransitNet/TransitNet.cpp
version7/branches/aecom/Transims70/TransitNet/TransitNet.hpp
version7/branches/aecom/Transims70/TransitNet/TransitNet.vcxproj
version7/branches/aecom/Transims70/TransitNet/TransitNet.vcxproj.filters
version7/branches/aecom/Transims70/TripPrep/Control.cpp
version7/branches/aecom/Transims70/TripPrep/Execute.cpp
version7/branches/aecom/Transims70/TripPrep/Read_Trips.cpp
version7/branches/aecom/Transims70/TripPrep/TripPrep.cpp
version7/branches/aecom/Transims70/TripPrep/TripPrep.hpp
version7/branches/aecom/Transims70/TripPrep/TripPrep.vcxproj
version7/branches/aecom/Transims70/TripPrep/TripPrep.vcxproj.filters
version7/branches/aecom/Transims70/TripSum/Read_Trips.cpp
version7/branches/aecom/Transims70/TripSum/TripSum.cpp
version7/branches/aecom/Transims70/TripSum/TripSum.vcxproj
version7/branches/aecom/Transims70/Validate/Validate.vcxproj
version7/branches/aecom/Transims70/VissimXML/VissimXML.vcxproj
version7/branches/aecom/Transims70/VolSpdData/VolSpdData.vcxproj
version7/branches/aecom/Transims70/ZoneData/ZoneData.vcxproj
Added Paths:
-----------
version7/branches/aecom/Transims70/DynusTPrep/
version7/branches/aecom/Transims70/DynusTPrep/Control.cpp
version7/branches/aecom/Transims70/DynusTPrep/DynusTPrep.cpp
version7/branches/aecom/Transims70/DynusTPrep/DynusTPrep.hpp
version7/branches/aecom/Transims70/DynusTPrep/DynusTPrep.vcxproj
version7/branches/aecom/Transims70/DynusTPrep/DynusTPrep.vcxproj.filters
version7/branches/aecom/Transims70/DynusTPrep/Execute.cpp
version7/branches/aecom/Transims70/DynusTPrep/Read_DynusT.cpp
version7/branches/aecom/Transims70/DynusTPrep/Read_Trajectory.cpp
version7/branches/aecom/Transims70/File_Service/Service_Summary_File.cpp
version7/branches/aecom/Transims70/GTFSData/Build_Network.cpp
version7/branches/aecom/Transims70/Include/Service_Summary.hpp
version7/branches/aecom/Transims70/Include/Service_Summary_File.hpp
version7/branches/aecom/Transims70/PlanSum/Write_Zone_Skims.cpp
version7/branches/aecom/Transims70/RoutePrep/Build_Service.cpp
version7/branches/aecom/Transims70/RoutePrep/Service_Summary.cpp
version7/branches/aecom/Transims70/TransitNet/Merge_Routes.cpp
version7/branches/aecom/Transims70/TransitNet/Stop_Node_Access.cpp
version7/branches/aecom/Transims70/TripPrep/Growth_Factors.cpp
Removed Paths:
-------------
version7/branches/aecom/Transims70/x64/Release/MatrixData.exe
Property Changed:
----------------
version7/branches/aecom/Transims70/x64/Release/
Modified: version7/branches/aecom/Transims70/AddLRSData/AddLRSData.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/AddLRSData/AddLRSData.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/AddLRSData/AddLRSData.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<VCProjectVersion>15.0</VCProjectVersion>
<ProjectGuid>{D8F6A781-48CC-46AA-9CFC-E74F7E774ABB}</ProjectGuid>
<RootNamespace>AddLRSData</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcJoin/ArcJoin.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcJoin/ArcJoin.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcJoin/ArcJoin.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{59BB6487-B680-448F-AFF8-AC671FABEEBC}</ProjectGuid>
<RootNamespace>ArcJoin</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcNet/ArcNet.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/ArcNet.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/ArcNet.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -11,7 +11,7 @@
ArcNet::ArcNet (void) : Draw_Service ()
{
Program ("ArcNet");
- Version (1);
+ Version (3);
Title ("Generate ArcView Shapefiles from a TRANSIMS Network");
System_File_Type optional_files [] = {
@@ -78,7 +78,7 @@
AB_Map_Flag (true);
route_flag = schedule_flag = driver_flag = service_flag = route_node_flag = false;
- timing_flag = subzone_flag = analysis_flag = centerline_flag = false;
+ timing_flag = subzone_flag = analysis_flag = centerline_flag = point_data_flag = false;
run_field = service_field = user_field = 0;
zone_join_field = -1;
Modified: version7/branches/aecom/Transims70/ArcNet/ArcNet.hpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/ArcNet.hpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/ArcNet.hpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -83,7 +83,7 @@
int zone_join_field;
Points_Map zone_polygons;
- bool route_flag, schedule_flag, driver_flag, service_flag, route_node_flag;
+ bool route_flag, schedule_flag, driver_flag, service_flag, route_node_flag, point_data_flag;
bool timing_flag, subzone_flag, time_flag, zone_polygon_flag, centerline_flag, analysis_flag;
Dtime time;
Modified: version7/branches/aecom/Transims70/ArcNet/ArcNet.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/ArcNet.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/ArcNet.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{D74738D4-1FFB-4D4E-ADB7-99B350D03F77}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ArcNet</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcNet/Control.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Control.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Control.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -284,6 +284,8 @@
arcview_access.Shape_Type (LINE);
arcview_access.Set_Projection ();
+ point_data_flag = true;
+
Required_File_Check (arcview_access, ACCESS_LINK);
Required_File_Check (arcview_access, LOCATION);
Required_File_Check (arcview_access, PARKING);
@@ -499,6 +501,7 @@
Required_File_Check (arcview_route, TRANSIT_ROUTE);
Required_File_Check (arcview_route, TRANSIT_STOP);
+ point_data_flag = true;
if (!arcview_route.Open (Project_Filename (key))) {
File_Error ("Opening New Arc Transit Route File", arcview_route.Shape_Filename ());
Modified: version7/branches/aecom/Transims70/ArcNet/Draw_Driver.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Draw_Driver.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Draw_Driver.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -11,7 +11,7 @@
void ArcNet::Draw_Driver (void)
{
int j, dir, overlap;
- int route_field, links_field, type_field, notes_field;
+ int route_field, links_field, type_field, name_field, notes_field;
double length, side, side_offset;
bool offset_flag, first;
@@ -22,15 +22,16 @@
Points_Itr pt_itr;
Driver_Itr driver_itr;
Db_Base *file;
-
+ Veh_Type_Data *veh_type_ptr;
+
file = System_File_Base (TRANSIT_DRIVER);
route_field = file->Required_Field ("ROUTE");
links_field = file->Required_Field ("LINKS", "NLINKS", "NUM_LINKS");
type_field = file->Optional_Field ("TYPE", "VEHTYPE", "VEH_TYPE");
+ name_field = file->Optional_Field ("NAME", "ROUTE_NAME", "RTNAME", "DESCRIPTION");
notes_field = file->Optional_Field (NOTES_FIELD_NAMES);
-
Show_Message ("Draw Transit Driver -- Record");
Set_Progress ();
@@ -53,7 +54,11 @@
arcview_driver.Put_Field (route_field, line_itr->Route ());
arcview_driver.Put_Field (links_field, (int) line_itr->driver_array.size ());
- arcview_driver.Put_Field (type_field, line_itr->Type ());
+
+ veh_type_ptr = &veh_type_array [line_itr->Type ()];
+
+ arcview_driver.Put_Field (type_field, veh_type_ptr->Type ());
+ arcview_driver.Put_Field (name_field, line_itr->Name ());
arcview_driver.Put_Field (notes_field, line_itr->Notes ());
//---- create the route shape ----
Modified: version7/branches/aecom/Transims70/ArcNet/Draw_Route.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Draw_Route.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Draw_Route.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -101,21 +101,41 @@
stop_ptr = &stop_array [stop_itr->Stop ()];
- map_itr = dir_map.find (stop_ptr->Link_Dir ());
- dir_index = map_itr->second;
-
count = 0;
length = 0;
- for (i=num_legs - 1; i >= 0; i--) {
- index = line_itr->driver_array [i];
- if (dir_index == index) break;
+ if (stop_ptr->Node () < 0) {
- dir_ptr = &dir_array [index];
- link_ptr = &link_array [dir_ptr->Link ()];
+ map_itr = dir_map.find (stop_ptr->Link_Dir ());
+ dir_index = map_itr->second;
- count++;
- length += UnRound (link_ptr->Length ());
+ for (i = num_legs - 1; i >= 0; i--) {
+ index = line_itr->driver_array [i];
+ if (dir_index == index) break;
+
+ dir_ptr = &dir_array [index];
+ link_ptr = &link_array [dir_ptr->Link ()];
+
+ count++;
+ length += UnRound (link_ptr->Length ());
+ }
+ } else {
+
+ for (i = num_legs - 1; i >= 0; i--) {
+ index = line_itr->driver_array [i];
+
+ dir_ptr = &dir_array [index];
+ link_ptr = &link_array [dir_ptr->Link ()];
+
+ if (dir_ptr->Dir () == 0) {
+ if (link_ptr->Bnode () == stop_ptr->Node ()) break;
+ } else {
+ if (link_ptr->Anode () == stop_ptr->Node ()) break;
+
+ }
+ count++;
+ length += UnRound (link_ptr->Length ());
+ }
}
if (i < 0) goto path_error;
@@ -131,21 +151,40 @@
stop_ptr = &stop_array [stop_itr->Stop ()];
- map_itr = dir_map.find (stop_ptr->Link_Dir ());
- dir_index = map_itr->second;
-
count = 0;
length = 0;
- for (i=0; i <= num_legs; i++) {
- index = line_itr->driver_array [i];
- if (dir_index == index) break;
+ if (stop_ptr->Node () < 0) {
+ map_itr = dir_map.find (stop_ptr->Link_Dir ());
+ dir_index = map_itr->second;
- dir_ptr = &dir_array [index];
- link_ptr = &link_array [dir_ptr->Link ()];
+ for (i = 0; i <= num_legs; i++) {
+ index = line_itr->driver_array [i];
+ if (dir_index == index) break;
- count++;
- length += UnRound (link_ptr->Length ());
+ dir_ptr = &dir_array [index];
+ link_ptr = &link_array [dir_ptr->Link ()];
+
+ count++;
+ length += UnRound (link_ptr->Length ());
+ }
+
+ } else {
+
+ for (i = 0; i <= num_legs; i++) {
+ index = line_itr->driver_array [i];
+
+ dir_ptr = &dir_array [index];
+ link_ptr = &link_array [dir_ptr->Link ()];
+
+ if (dir_ptr->Dir () == 0) {
+ if (link_ptr->Anode () == stop_ptr->Node ()) break;
+ } else {
+ if (link_ptr->Bnode () == stop_ptr->Node ()) break;
+ }
+ count++;
+ length += UnRound (link_ptr->Length ());
+ }
}
if (i > num_legs) goto path_error;
@@ -152,9 +191,10 @@
if (count > 0) {
Warning (String ("Route %d %s has %d links (%.1lf miles) before the first stop") % line_itr->Route () % line_itr->Name () % count % External_Units (length, MILES));
}
+
//---- create transit legs ----
- for (j=1; i <= num_legs; i++) {
+ for (j = 1; i <= num_legs; i++) {
dir_index = line_itr->driver_array [i];
dir_ptr = &dir_array [dir_index];
@@ -163,7 +203,7 @@
link_dir = dir_ptr->Link_Dir ();
link_ptr = &link_array [dir_ptr->Link ()];
-
+
link_len = UnRound (link_ptr->Length ());
side_offset = route_offset;
@@ -190,63 +230,79 @@
}
offset = side_offset;
- //---- check for stops ----
+ if (stop_ptr->Node () < 0) {
- while (stop_ptr->Link_Dir () == link_dir) {
- stop_off = UnRound (stop_ptr->Offset ());
+ //---- check for stops ----
- if (stop_off <= offset) {
- offset = stop_off - 2.0;
- }
- tot_len += length = stop_off - offset;
+ while (stop_ptr->Link_Dir () == link_dir) {
+ stop_off = UnRound (stop_ptr->Offset ());
- Link_Shape (link_ptr, dir, points, offset, length, side);
+ if (stop_off <= offset) {
+ offset = stop_off - 2.0;
+ }
+ tot_len += length = stop_off - offset;
- offset = stop_off;
+ Link_Shape (link_ptr, dir, points, offset, length, side);
- if (j != 1) {
+ offset = stop_off;
- //---- draw the link to the stop ----
+ if (j != 1) {
- pt_itr = points.begin ();
+ //---- draw the link to the stop ----
- if (side == 0.0 && pt_itr != points.end ()) {
- pt_itr++;
+ pt_itr = points.begin ();
+
+ if (side == 0.0 && pt_itr != points.end ()) {
+ pt_itr++;
+ }
+ for (; pt_itr != points.end (); pt_itr++) {
+ arcview_route.push_back (*pt_itr);
+ }
+ pt_itr = --points.end ();
+ } else {
+ //pt_itr = points.begin ();
+ pt_itr = --points.end ();
}
- for (; pt_itr != points.end (); pt_itr++) {
- arcview_route.push_back (*pt_itr);
+ stop_pt_itr = stop_pt.find (stop_ptr->Stop ());
+
+ if (stop_pt_itr != stop_pt.end ()) {
+ arcview_route.push_back (stop_pt_itr->second);
}
- pt_itr = --points.end ();
- } else {
- //pt_itr = points.begin ();
- pt_itr = --points.end ();
- }
- stop_pt_itr = stop_pt.find (stop_ptr->Stop ());
- if (stop_pt_itr != stop_pt.end ()) {
- arcview_route.push_back (stop_pt_itr->second);
- }
+ //---- find the next stop -----
- //---- find the next stop -----
+ if (++j > stops) break;
- if (++j > stops) break;
+ arcview_route.push_back (*pt_itr);
- arcview_route.push_back (*pt_itr);
+ stop_itr++;
- stop_itr++;
+ stop = stop_itr->Stop ();
- stop = stop_itr->Stop ();
+ stop_ptr = &stop_array [stop];
+ }
- stop_ptr = &stop_array [stop];
- }
+ //---- complete the link ----
- //---- complete the link ----
+ if (i < num_legs) {
+ tot_len += length = link_len - offset - side_offset;
- if (i < num_legs) {
- tot_len += length = link_len - offset - side_offset;
+ Link_Shape (link_ptr, dir, points, offset, length, side);
- Link_Shape (link_ptr, dir, points, offset, length, side);
+ pt_itr = points.begin ();
+ if (!offset_flag && pt_itr != points.end ()) {
+ pt_itr++;
+ }
+ for (; pt_itr != points.end (); pt_itr++) {
+ arcview_route.push_back (*pt_itr);
+ }
+ }
+ } else {
+ tot_len += link_len;
+
+ Link_Shape (link_ptr, dir, points, -1, -1, side);
+
pt_itr = points.begin ();
if (!offset_flag && pt_itr != points.end ()) {
Modified: version7/branches/aecom/Transims70/ArcNet/Get_Location_Data.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Get_Location_Data.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Get_Location_Data.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -15,20 +15,34 @@
Point_Map_Stat map_stat;
if (Data_Service::Get_Location_Data (file, location_rec)) {
- if (arcview_location.Is_Open ()) {
- arcview_location.Copy_Fields (file);
-
+ if (point_data_flag || arcview_location.Is_Open ()) {
setback = UnRound (location_rec.Setback ());
side = location_side;
if (setback > side) side = setback;
- Point_Offset (location_rec.Link (), location_rec.Dir (), location_rec.Offset (), side, arcview_location);
+ Point_Offset (location_rec.Link (), location_rec.Dir (), location_rec.Offset (), side, points);
- if (arcview_location.size () == 0) {
+ if (points.size () == 0) {
Warning (String ("Location %d could not be drawn") % location_rec.Location ());
return (false);
- } else if (!arcview_location.Write_Record ()) {
+ }
+ //---- save the location point data ----
+
+ map_stat = location_pt.insert (Point_Map_Data (location_rec.Location (), points [0]));
+
+ if (!map_stat.second) {
+ Warning ("Duplicate Location Record = ") << location_rec.Location ();
+ }
+ }
+
+ if (arcview_location.Is_Open ()) {
+ arcview_location.Copy_Fields (file);
+
+ arcview_location.clear ();
+ arcview_location.push_back (points [0]);
+
+ if (!arcview_location.Write_Record ()) {
Error (String ("Writing %s Location=%d") % arcview_location.File_Type () % location_rec.Location ());
}
Modified: version7/branches/aecom/Transims70/ArcNet/Get_Parking_Data.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Get_Parking_Data.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Get_Parking_Data.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -14,19 +14,31 @@
Park_Nest_Itr nest_itr;
if (Data_Service::Get_Parking_Data (file, parking_rec)) {
- if (arcview_parking.Is_Open ()) {
- arcview_parking.Copy_Fields (file, true);
-
+ if (point_data_flag || arcview_parking.Is_Open ()) {
if (!file.Nested ()) {
- Point_Offset (parking_rec.Link (), parking_rec.Dir (), parking_rec.Offset (), parking_side, arcview_parking);
+ Point_Offset (parking_rec.Link (), parking_rec.Dir (), parking_rec.Offset (), parking_side, points);
+ if (points.size () == 0) {
+ Warning (String ("Parking Lot %d could not be drawn") % parking_rec.Parking ());
+ }
+
//---- save the parking point data ----
- map_stat = parking_pt.insert (Point_Map_Data (parking_rec.Parking (), arcview_parking [0]));
+ map_stat = parking_pt.insert (Point_Map_Data (parking_rec.Parking (), points [0]));
if (!map_stat.second && file.Version () > 40) {
Warning ("Duplicate Parking Record = ") << parking_rec.Parking ();
}
+ }
+ }
+
+ if (arcview_parking.Is_Open ()) {
+ arcview_parking.Copy_Fields (file, true);
+
+ if (!file.Nested ()) {
+ arcview_parking.clear ();
+ arcview_parking.push_back (points [0]);
+
if (file.Num_Nest () == 0) {
file.Blank_Nested_Fields ();
file.Nested (true);
@@ -43,9 +55,7 @@
return (false);
}
}
- if (arcview_parking.size () == 0) {
- Warning (String ("Parking Lot %d could not be drawn") % parking_rec.Parking ());
- } else if (!arcview_parking.Write_Record ()) {
+ if (!arcview_parking.Write_Record ()) {
Error (String ("Writing %s Lot=%d") % arcview_parking.File_Type () % parking_rec.Parking ());
}
parking_rec.clear ();
Modified: version7/branches/aecom/Transims70/ArcNet/Get_Stop_Data.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcNet/Get_Stop_Data.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcNet/Get_Stop_Data.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -11,28 +11,47 @@
bool ArcNet::Get_Stop_Data (Stop_File &file, Stop_Data &stop_rec)
{
Point_Map_Stat map_stat;
+ XYZ_Point point;
if (Data_Service::Get_Stop_Data (file, stop_rec)) {
- if (arcview_stop.Is_Open ()) {
- arcview_stop.Copy_Fields (file);
- Point_Offset (stop_rec.Link (), stop_rec.Dir (), stop_rec.Offset (), stop_side, arcview_stop);
+ if (point_data_flag || arcview_stop.Is_Open ()) {
- if (arcview_stop.size () == 0) {
- Warning (String ("Transit Stop %d could not be drawn") % stop_rec.Stop ());
- return (false);
- } else if (!arcview_stop.Write_Record ()) {
- Error (String ("Writing %s Stop=%d") % arcview_stop.File_Type () % stop_rec.Stop ());
+ if (file.Stop_Node ()) {
+ Node_Data *node_ptr = &node_array [stop_rec.Node ()];
+
+ point.x = UnRound (node_ptr->X ());
+ point.y = UnRound (node_ptr->Y ());
+ point.z = UnRound (node_ptr->Z ());
+
+ } else {
+ Point_Offset (stop_rec.Link (), stop_rec.Dir (), stop_rec.Offset (), stop_side, points);
+
+ if (points.size () == 0) {
+ Warning (String ("Transit Stop %d could not be drawn") % stop_rec.Stop ());
+ return (false);
+ }
+ point = points [0];
}
-
//---- save the location point data ----
- map_stat = stop_pt.insert (Point_Map_Data (stop_rec.Stop (), arcview_stop [0]));
+ map_stat = stop_pt.insert (Point_Map_Data (stop_rec.Stop (), point));
if (!map_stat.second) {
Warning ("Duplicate Stop Record = ") << stop_rec.Stop ();
}
}
+
+ if (arcview_stop.Is_Open ()) {
+ arcview_stop.Copy_Fields (file);
+
+ arcview_stop.clear ();
+ arcview_stop.push_back (point);
+
+ if (!arcview_stop.Write_Record ()) {
+ Error (String ("Writing %s Stop=%d") % arcview_stop.File_Type () % stop_rec.Stop ());
+ }
+ }
return (true);
}
return (false);
Modified: version7/branches/aecom/Transims70/ArcPerf/ArcPerf.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcPerf/ArcPerf.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcPerf/ArcPerf.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{26E85782-126B-4A33-A07D-A86D89A22707}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ArcPerf</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcPlan/ArcPlan.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcPlan/ArcPlan.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcPlan/ArcPlan.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{5E5EFEDA-F28D-4CDF-9E16-FA2F99098A55}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ArcPlan</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcPlan/Get_Stop_Data.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcPlan/Get_Stop_Data.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcPlan/Get_Stop_Data.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -13,8 +13,20 @@
Point_Map_Stat map_stat;
if (Data_Service::Get_Stop_Data (file, stop_rec)) {
- Point_Offset (stop_rec.Link (), stop_rec.Dir (), stop_rec.Offset (), stop_side, points);
+ if (file.Stop_Node ()) {
+ XYZ_Point point;
+ Node_Data *node_ptr = &node_array [stop_rec.Node ()];
+ point.x = UnRound (node_ptr->X ());
+ point.y = UnRound (node_ptr->Y ());
+ point.x = UnRound (node_ptr->Z ());
+
+ points.clear ();
+ points.push_back (point);
+ } else {
+ Point_Offset (stop_rec.Link (), stop_rec.Dir (), stop_rec.Offset (), stop_side, points);
+ }
+
//---- save the location point data ----
map_stat = stop_pt.insert (Point_Map_Data (stop_rec.Stop (), points [0]));
Modified: version7/branches/aecom/Transims70/ArcRider/ArcRider.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcRider/ArcRider.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcRider/ArcRider.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -11,7 +11,7 @@
ArcRider::ArcRider (void) : Draw_Service ()
{
Program ("ArcRider");
- Version (0);
+ Version (1);
Title ("Ridership File Display Utility");
System_File_Type required_files [] = {
Modified: version7/branches/aecom/Transims70/ArcRider/ArcRider.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcRider/ArcRider.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcRider/ArcRider.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{8AD523A0-9546-464F-A4F3-0FFE6F3EF185}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ArcRider</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ArcRider/Control.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcRider/Control.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcRider/Control.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -47,7 +47,7 @@
line_flag = true;
arcview_line.Add_Field ("ROUTE", DB_INTEGER, 10);
- arcview_line.Add_Field ("NAME", DB_STRING, 40);
+ arcview_line.Add_Field ("NAME", DB_STRING, 60);
arcview_line.Add_Field ("MODE", DB_STRING, 16, TRANSIT_CODE);
arcview_line.Add_Field ("STOPS", DB_INTEGER, 10);
arcview_line.Add_Field ("RUNS", DB_INTEGER, 10);
@@ -85,7 +85,7 @@
sum_flag = true;
arcview_sum.Add_Field ("GROUP", DB_INTEGER, 10);
- arcview_sum.Add_Field ("NAME", DB_STRING, 40);
+ arcview_sum.Add_Field ("NAME", DB_STRING, 60);
arcview_sum.Add_Field ("ROUTES", DB_INTEGER, 10);
arcview_sum.Add_Field ("STOPS", DB_INTEGER, 10);
arcview_sum.Add_Field ("RUNS", DB_INTEGER, 10);
@@ -120,6 +120,9 @@
arcview_rider.Add_Field ("LINK", DB_INTEGER, 10);
arcview_rider.Add_Field ("DIR", DB_INTEGER, 1);
+ if (Notes_Name_Flag ()) {
+ arcview_rider.Add_Field ("NAME", DB_STRING, 40);
+ }
arcview_rider.Add_Field ("SEGMENT", DB_INTEGER, 2);
arcview_rider.Add_Field ("LENGTH", DB_DOUBLE, 10.2, ((Metric_Flag () ? METERS : FEET)));
arcview_rider.Add_Field ("BOARD", DB_INTEGER, 10);
@@ -179,7 +182,7 @@
on_off_flag = group_flag = true;
arcview_group.Add_Field ("GROUP", DB_INTEGER, 10);
- arcview_group.Add_Field ("NAME", DB_STRING, 40);
+ arcview_group.Add_Field ("NAME", DB_STRING, 60);
arcview_group.Add_Field ("BOARD", DB_INTEGER, 10);
arcview_group.Add_Field ("ALIGHT", DB_INTEGER, 10);
arcview_group.Add_Field ("TOTAL", DB_INTEGER, 10);
@@ -216,7 +219,7 @@
arcview_cap.Add_Field ("MODE", DB_STRING, 16);
arcview_cap.Add_Field ("ROUTE", DB_INTEGER, 10);
if (Notes_Name_Flag ()) {
- arcview_cap.Add_Field ("NAME", DB_STRING, 40);
+ arcview_cap.Add_Field ("NAME", DB_STRING, 60);
}
arcview_cap.Add_Field ("TIME", DB_TIME, TIME_FIELD_SIZE, Time_Format ());
arcview_cap.Add_Field ("PERIOD", DB_INTEGER, 4);
Modified: version7/branches/aecom/Transims70/ArcRider/Write_Riders.cpp
===================================================================
--- version7/branches/aecom/Transims70/ArcRider/Write_Riders.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcRider/Write_Riders.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -10,7 +10,7 @@
void ArcRider::Write_Riders (void)
{
- int i, j, link, dir, link_field, dir_field, rider_field, seg_field, len_field, on_field, off_field, notes_field;
+ int i, j, link, dir, link_field, dir_field, name_field, rider_field, seg_field, len_field, on_field, off_field, notes_field;
int stop_num [20], nstop, stop, max_load, riders, seg, board, alight, *load, *enter, *cap_enter, capacity;
int start, end, cap_start, cap_end, runs, run_field, factor_field, cap_field, capfac_field, pen_field, node;
double width, offset, end_offset, len, length, stop_off [20], factor, capfac;
@@ -27,6 +27,7 @@
nstop = stop = start = cap_start = 0;
link_field = arcview_rider.Field_Number ("LINK");
dir_field = arcview_rider.Field_Number ("DIR");
+ name_field = arcview_rider.Field_Number ("NAME");
seg_field = arcview_rider.Field_Number ("SEGMENT");
len_field = arcview_rider.Field_Number ("LENGTH");
on_field = arcview_rider.Field_Number ("BOARD");
@@ -114,6 +115,7 @@
arcview_rider.Put_Field (link_field, link_ptr->Link ());
arcview_rider.Put_Field (dir_field, dir);
+ arcview_rider.Put_Field (name_field, link_ptr->Name ());
length = UnRound (link_ptr->Length ());
Modified: version7/branches/aecom/Transims70/ArcSnapshot/ArcSnapshot.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ArcSnapshot/ArcSnapshot.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ArcSnapshot/ArcSnapshot.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{0C2FB245-D39A-4D92-87B9-5F446B91C6F4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ArcSnapshot</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/Converge_Service/Converge_Service.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/Converge_Service/Converge_Service.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Converge_Service/Converge_Service.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -74,7 +74,7 @@
<ProjectGuid>{6E283F95-CCA9-4AB8-B287-3B108D9D4D6B}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Converge_Service</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/ConvertTrips/ConvertTrips.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/ConvertTrips/ConvertTrips.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/ConvertTrips/ConvertTrips.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -22,7 +22,7 @@
<ProjectGuid>{C547021E-31F8-4DFF-BCFD-0F176E581B95}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>ConvertTrips</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/CountSum/CountSum.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/CountSum/CountSum.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/CountSum/CountSum.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -21,7 +21,7 @@
<PropertyGroup Label="Globals">
<ProjectGuid>{F8D36523-F1C2-437B-8D87-C98BED744701}</ProjectGuid>
<RootNamespace>CountSum</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Modified: version7/branches/aecom/Transims70/Data_Service/Control.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Control.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Control.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -132,6 +132,7 @@
for (count=0, str_itr = str_list.begin (); str_itr != str_list.end (); str_itr++, count++) {
if (count == 0) continue;
key = *str_itr;
+
key.Parse (parts, "=");
if (parts.size () != 2) {
@@ -154,6 +155,7 @@
} else {
mode = parts [0].Integer ();
num = Transit_Code (parts [1]);
+
if (num == ANY_TRANSIT) {
Error ("Route Mode Map is Out of Range");
}
Modified: version7/branches/aecom/Transims70/Data_Service/Data_Service.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Data_Service.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Data_Service.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -39,7 +39,7 @@
perf_veh_type_map.assign (25, 0);
fare_flag = false;
- num_fare_zone = num_lane_flows = 0;
+ num_fare_zone = num_lane_flows = num_uturns = 0;
turn_shape_setback = TURN_SHAPE_SETBACK;
dat = this;
Modified: version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -57,6 +57,7 @@
<ClInclude Include="..\Include\Route_Nodes_Data.hpp" />
<ClInclude Include="..\Include\Schedule_Data.hpp" />
<ClInclude Include="..\Include\Selection_Data.hpp" />
+ <ClInclude Include="..\Include\Service_Summary.hpp" />
<ClInclude Include="..\Include\Shape_Data.hpp" />
<ClInclude Include="..\Include\Signal_Data.hpp" />
<ClInclude Include="..\Include\Sign_Data.hpp" />
@@ -199,7 +200,7 @@
<ProjectGuid>{551DFC05-B83F-4952-BF03-51AA41B052F4}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Data_Service</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -320,6 +321,7 @@
<AdditionalIncludeDirectories>..\Include</AdditionalIncludeDirectories>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <StructMemberAlignment>Default</StructMemberAlignment>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
Modified: version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj.filters
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj.filters 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Data_Service.vcxproj.filters 2019-04-05 20:12:11 UTC (rev 1717)
@@ -206,6 +206,9 @@
<ClInclude Include="..\Include\Travel_Time_Data.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\Include\Service_Summary.hpp">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Read_Access_Links.cpp">
Modified: version7/branches/aecom/Transims70/Data_Service/Read_Connections.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Read_Connections.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Read_Connections.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -21,7 +21,7 @@
Initialize_Connects (file);
- num = 0;
+ num = num_uturns = 0;
while (file.Read ()) {
Show_Progress ();
@@ -52,6 +52,7 @@
continue;
} else {
connect_array.push_back (connect_rec);
+ if (connect_rec.Type () == UTURN) num_uturns++;
}
}
}
Modified: version7/branches/aecom/Transims70/Data_Service/Read_Drivers.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Read_Drivers.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Read_Drivers.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -142,8 +142,33 @@
}
last_index = *driver_itr;
}
- if (stop_ptr->Link_Dir () == dir_ptr->Link_Dir ()) break;
link_ptr = &link_array [dir_ptr->Link ()];
+
+ if (stop_ptr->Node () < 0) {
+ if (stop_ptr->Link_Dir () == dir_ptr->Link_Dir ()) break;
+ } else {
+ if (stop_itr == line_itr->begin ()) {
+ if (dir_ptr->Dir () == 0) {
+ if (stop_ptr->Node () == link_ptr->Anode ()) break;
+ } else {
+ if (stop_ptr->Node () == link_ptr->Bnode ()) break;
+ }
+ } else {
+ if (dir_ptr->Dir () == 0) {
+ if (stop_ptr->Node () == link_ptr->Bnode ()) {
+ length += link_ptr->Length ();
+ offset = 0;
+ break;
+ }
+ } else {
+ if (stop_ptr->Node () == link_ptr->Anode ()) {
+ length += link_ptr->Length ();
+ offset = 0;
+ break;
+ }
+ }
+ }
+ }
length += link_ptr->Length () - offset;
offset = 0;
}
Modified: version7/branches/aecom/Transims70/Data_Service/Read_Locations.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Read_Locations.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Read_Locations.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -146,8 +146,13 @@
if (file.Version () <= 40) return (false);
}
- location_rec.Origin (-1);
- location_rec.Destination (-1);
+ if (file.Origin_Destination ()) {
+ location_rec.Origin (file.Origin ());
+ location_rec.Destination (file.Destination ());
+ } else {
+ location_rec.Origin (-1);
+ location_rec.Destination (-1);
+ }
location_rec.Notes (file.Notes ());
return (true);
}
Modified: version7/branches/aecom/Transims70/Data_Service/Read_Stops.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Read_Stops.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Read_Stops.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -81,21 +81,31 @@
{
int link, dir, offset, use;
+ Int_Map_Itr map_itr;
+
stop_rec.Stop (file.Stop ());
if (stop_rec.Stop () == 0) return (false);
- //---- check/convert the link number ----
+ if (file.Stop_Node ()) {
+ map_itr = node_map.find (file.Node ());
+ if (map_itr == node_map.end ()) return (false);
- link = file.Link ();
- dir = file.Dir ();
- offset = Round (file.Offset ());
+ stop_rec.Node (map_itr->second);
+ } else {
- if (Set_Link_Direction (file, link, dir, offset) == 0) return (false);
-
- stop_rec.Link (link);
- stop_rec.Dir (dir);
- stop_rec.Offset (offset);
+ //---- check/convert the link number ----
+ link = file.Link ();
+ dir = file.Dir ();
+ offset = Round (file.Offset ());
+
+ if (Set_Link_Direction (file, link, dir, offset) == 0) return (false);
+
+ stop_rec.Link (link);
+ stop_rec.Dir (dir);
+ stop_rec.Offset (offset);
+ }
+
//----- optional fields ----
use = file.Use ();
Modified: version7/branches/aecom/Transims70/Data_Service/Write_Locations.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Write_Locations.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Write_Locations.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -56,6 +56,10 @@
}
file.Zone (zone);
+ if (file.Origin_Destination ()) {
+ file.Origin (data.Origin ());
+ file.Destination (data.Destination ());
+ }
file.Notes (data.Notes ());
if (!file.Write ()) {
Modified: version7/branches/aecom/Transims70/Data_Service/Write_Stops.cpp
===================================================================
--- version7/branches/aecom/Transims70/Data_Service/Write_Stops.cpp 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Data_Service/Write_Stops.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -35,15 +35,26 @@
int Data_Service::Put_Stop_Data (Stop_File &file, Stop_Data &data)
{
- Link_Data *link_ptr;
+ if (file.Stop_Node ()) {
+ if (data.Node () < 0) return (0);
- link_ptr = &link_array [data.Link ()];
+ Node_Data *node_ptr = &node_array [data.Node ()];
+ if (node_ptr->Node () < 0) return (0);
+
+ file.Node (node_ptr->Node ());
+ } else {
+ if (data.Link () < 0) return (0);
+
+ Link_Data *link_ptr = &link_array [data.Link ()];
+
+ file.Link (link_ptr->Link ());
+ file.Dir (data.Dir ());
+ file.Offset (UnRound (data.Offset ()));
+ }
file.Stop (data.Stop ());
file.Name (data.Name ());
- file.Link (link_ptr->Link ());
- file.Dir (data.Dir ());
- file.Offset (UnRound (data.Offset ()));
+
file.Use (data.Use ());
file.Type (data.Type ());
file.Space (data.Space ());
Modified: version7/branches/aecom/Transims70/Draw_Service/Draw_Service.vcxproj
===================================================================
--- version7/branches/aecom/Transims70/Draw_Service/Draw_Service.vcxproj 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/Draw_Service/Draw_Service.vcxproj 2019-04-05 20:12:11 UTC (rev 1717)
@@ -44,7 +44,7 @@
<ProjectGuid>{BFC302F1-3416-4C9B-B4B1-91763557022A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>Draw_Service</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Index: version7/branches/aecom/Transims70/DynusTPrep
===================================================================
--- version7/branches/aecom/Transims70/DynusTPrep 2019-01-15 21:16:35 UTC (rev 1716)
+++ version7/branches/aecom/Transims70/DynusTPrep 2019-04-05 20:12:11 UTC (rev 1717)
Property changes on: version7/branches/aecom/Transims70/DynusTPrep
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,13 ##
+[Bb]in
+obj
+[Dd]ebug
+[Rr]elease
+*.user
+*.aps
+*.eto
+ClientBin
+GeneratedArtifacts
+_Pvt_Extensions
+project.lock.json
+*.nuget.props
+*.nuget.targets
Added: version7/branches/aecom/Transims70/DynusTPrep/Control.cpp
===================================================================
--- version7/branches/aecom/Transims70/DynusTPrep/Control.cpp (rev 0)
+++ version7/branches/aecom/Transims70/DynusTPrep/Control.cpp 2019-04-05 20:12:11 UTC (rev 1717)
@@ -0,0 +1,130 @@
+//*********************************************************
+// Control.cpp - process the control parameters
+//*********************************************************
+
+#include "DynusTPrep.hpp...
[truncated message content] |
