Skip to content

Commit 6b043fc

Browse files
PeterVermontPeterVermont
committed
Created .editorconfig and formatted and refactored all documents.
I ran FresnoABM regression and it still passed so we will now see about everything else!
1 parent e26e5f1 commit 6b043fc

File tree

526 files changed

+85081
-85641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

526 files changed

+85081
-85641
lines changed

‎.editorconfig

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
# Code files
9+
[*.{cs,csx,vb,vbx}]
10+
indent_size = 2
11+
insert_final_newline = true
12+
charset = utf-8-bom
13+
###############################
14+
# .NET Coding Conventions #
15+
###############################
16+
[*.{cs,vb}]
17+
# Organize usings
18+
dotnet_sort_system_directives_first = true
19+
# this. preferences
20+
dotnet_style_qualification_for_field = false : silent
21+
dotnet_style_qualification_for_property = false : silent
22+
dotnet_style_qualification_for_method = false : silent
23+
dotnet_style_qualification_for_event = false : silent
24+
# Language keywords vs BCL types preferences
25+
dotnet_style_predefined_type_for_locals_parameters_members = true : silent
26+
dotnet_style_predefined_type_for_member_access = true : silent
27+
# Parentheses preferences
28+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity : silent
29+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity : silent
30+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity : silent
31+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary : silent
32+
# Modifier preferences
33+
dotnet_style_require_accessibility_modifiers = for_non_interface_members : silent
34+
dotnet_style_readonly_field = true : suggestion
35+
# Expression-level preferences
36+
dotnet_style_object_initializer = true : suggestion
37+
dotnet_style_collection_initializer = true : suggestion
38+
dotnet_style_explicit_tuple_names = true : suggestion
39+
dotnet_style_null_propagation = true : suggestion
40+
dotnet_style_coalesce_expression = true : suggestion
41+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true : silent
42+
dotnet_prefer_inferred_tuple_names = true : suggestion
43+
dotnet_prefer_inferred_anonymous_type_member_names = true : suggestion
44+
dotnet_style_prefer_auto_properties = true : silent
45+
dotnet_style_prefer_conditional_expression_over_assignment = true : silent
46+
dotnet_style_prefer_conditional_expression_over_return = true : silent
47+
###############################
48+
# Naming Conventions #
49+
###############################
50+
# Style Definitions
51+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
52+
# Use PascalCase for constant fields
53+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
54+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
55+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
56+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
57+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
58+
dotnet_naming_symbols.constant_fields.required_modifiers = const
59+
###############################
60+
# C# Coding Conventions #
61+
###############################
62+
[*.cs]
63+
# var preferences
64+
csharp_style_var_for_built_in_types = false : silent
65+
csharp_style_var_when_type_is_apparent = false : silent
66+
csharp_style_var_elsewhere = false : silent
67+
# Expression-bodied members
68+
csharp_style_expression_bodied_methods = false : silent
69+
csharp_style_expression_bodied_constructors = false : silent
70+
csharp_style_expression_bodied_operators = false : silent
71+
csharp_style_expression_bodied_properties = true : silent
72+
csharp_style_expression_bodied_indexers = true : silent
73+
csharp_style_expression_bodied_accessors = true : silent
74+
# Pattern matching preferences
75+
csharp_style_pattern_matching_over_is_with_cast_check = true : suggestion
76+
csharp_style_pattern_matching_over_as_with_null_check = true : suggestion
77+
# Null-checking preferences
78+
csharp_style_throw_expression = true : suggestion
79+
csharp_style_conditional_delegate_call = true : suggestion
80+
# Modifier preferences
81+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async : suggestion
82+
# Expression-level preferences
83+
csharp_prefer_braces = true : silent
84+
csharp_style_deconstructed_variable_declaration = true : suggestion
85+
csharp_prefer_simple_default_expression = true : suggestion
86+
csharp_style_pattern_local_over_anonymous_function = true : suggestion
87+
csharp_style_inlined_variable_declaration = true : suggestion
88+
###############################
89+
# C# Formatting Rules #
90+
###############################
91+
# New line preferences
92+
csharp_new_line_before_open_brace = none
93+
csharp_new_line_before_else = false
94+
csharp_new_line_before_catch = false
95+
csharp_new_line_before_finally = false
96+
csharp_new_line_before_members_in_object_initializers = true
97+
csharp_new_line_before_members_in_anonymous_types = true
98+
csharp_new_line_between_query_expression_clauses = true
99+
# Indentation preferences
100+
csharp_indent_case_contents = true
101+
csharp_indent_switch_labels = true
102+
csharp_indent_labels = flush_left
103+
# Space preferences
104+
csharp_space_after_cast = false
105+
csharp_space_after_keywords_in_control_flow_statements = true
106+
csharp_space_between_method_call_parameter_list_parentheses = false
107+
csharp_space_between_method_declaration_parameter_list_parentheses = false
108+
csharp_space_between_parentheses = false
109+
csharp_space_before_colon_in_inheritance_clause = true
110+
csharp_space_after_colon_in_inheritance_clause = true
111+
csharp_space_around_binary_operators = before_and_after
112+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
113+
csharp_space_between_method_call_name_and_opening_parenthesis = false
114+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
115+
# Wrapping preferences
116+
csharp_preserve_single_line_statements = true
117+
csharp_preserve_single_line_blocks = true
118+
###############################
119+
# VB Coding Conventions #
120+
###############################
121+
[*.vb]
122+
# Modifier preferences
123+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async : suggestion

‎DaySim.Customizations/DVRPC/PathTypeModels/DVRPC_PathTypeModel.cs

+26-26
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,30 @@
22
using DaySim.Framework.Roster;
33

44
namespace DaySim.PathTypeModels {
5-
class DVRPC_PathTypeModel : PathTypeModel {
6-
protected override void RegionSpecificTransitImpedanceCalculation(int skimMode, int pathType, double votValue, int outboundTime, int returnTime, int originZoneId, int destinationZoneId, ref double outboundInVehicleTime, ref double returnInVehicleTime, ref double pathTypeSpecificTime, ref double pathTypeSpecificTimeWeight) {
7-
//Global.PrintFile.WriteLine("DVRPC_PathTypeModel.RegionSpecificTransitImpedanceCalculation called");
8-
//this is the outer weight on the sum of all the path specific terms
9-
pathTypeSpecificTimeWeight = 1.0;
10-
pathTypeSpecificTime = 0.0;
11-
if (!Global.Configuration.IsInEstimationMode) {
12-
pathTypeSpecificTime =
13-
Global.Configuration.PathImpedance_TransitLightRailTimeAdditiveWeight * ImpedanceRoster.GetValue("lrttime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
14-
+ Global.Configuration.PathImpedance_TransitSubwayTimeAdditiveWeight * ImpedanceRoster.GetValue("subtime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
15-
+ Global.Configuration.PathImpedance_TransitCommuterRailTimeAdditiveWeight * ImpedanceRoster.GetValue("comrtime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
16-
+ Global.Configuration.PathImpedance_TransitPremiumBusTimeAdditiveWeight * ImpedanceRoster.GetValue("brttime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
17-
+ Global.Configuration.PathImpedance_TransitPATTimeAdditiveWeight * ImpedanceRoster.GetValue("pattime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
18-
+ Global.Configuration.PathImpedance_TransitTrolleyTimeAdditiveWeight * ImpedanceRoster.GetValue("troltime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable;
19-
if (returnTime > 0) {
20-
pathTypeSpecificTime +=
21-
+Global.Configuration.PathImpedance_TransitLightRailTimeAdditiveWeight * ImpedanceRoster.GetValue("lrttime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
22-
+ Global.Configuration.PathImpedance_TransitSubwayTimeAdditiveWeight * ImpedanceRoster.GetValue("subtime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
23-
+ Global.Configuration.PathImpedance_TransitCommuterRailTimeAdditiveWeight * ImpedanceRoster.GetValue("comrtime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
24-
+ Global.Configuration.PathImpedance_TransitPremiumBusTimeAdditiveWeight * ImpedanceRoster.GetValue("brttime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
25-
+ Global.Configuration.PathImpedance_TransitPATTimeAdditiveWeight * ImpedanceRoster.GetValue("pattime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
26-
+ Global.Configuration.PathImpedance_TransitTrolleyTimeAdditiveWeight * ImpedanceRoster.GetValue("troltime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable;
27-
}
28-
}
29-
} //end RegionSpecificTransitImpedanceCalculation
30-
} //end class
5+
internal class DVRPC_PathTypeModel : PathTypeModel {
6+
protected override void RegionSpecificTransitImpedanceCalculation(int skimMode, int pathType, double votValue, int outboundTime, int returnTime, int originZoneId, int destinationZoneId, ref double outboundInVehicleTime, ref double returnInVehicleTime, ref double pathTypeSpecificTime, ref double pathTypeSpecificTimeWeight) {
7+
//Global.PrintFile.WriteLine("DVRPC_PathTypeModel.RegionSpecificTransitImpedanceCalculation called");
8+
//this is the outer weight on the sum of all the path specific terms
9+
pathTypeSpecificTimeWeight = 1.0;
10+
pathTypeSpecificTime = 0.0;
11+
if (!Global.Configuration.IsInEstimationMode) {
12+
pathTypeSpecificTime =
13+
Global.Configuration.PathImpedance_TransitLightRailTimeAdditiveWeight * ImpedanceRoster.GetValue("lrttime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
14+
+ Global.Configuration.PathImpedance_TransitSubwayTimeAdditiveWeight * ImpedanceRoster.GetValue("subtime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
15+
+ Global.Configuration.PathImpedance_TransitCommuterRailTimeAdditiveWeight * ImpedanceRoster.GetValue("comrtime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
16+
+ Global.Configuration.PathImpedance_TransitPremiumBusTimeAdditiveWeight * ImpedanceRoster.GetValue("brttime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
17+
+ Global.Configuration.PathImpedance_TransitPATTimeAdditiveWeight * ImpedanceRoster.GetValue("pattime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable
18+
+ Global.Configuration.PathImpedance_TransitTrolleyTimeAdditiveWeight * ImpedanceRoster.GetValue("troltime", skimMode, pathType, votValue, outboundTime, originZoneId, destinationZoneId).Variable;
19+
if (returnTime > 0) {
20+
pathTypeSpecificTime +=
21+
+Global.Configuration.PathImpedance_TransitLightRailTimeAdditiveWeight * ImpedanceRoster.GetValue("lrttime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
22+
+ Global.Configuration.PathImpedance_TransitSubwayTimeAdditiveWeight * ImpedanceRoster.GetValue("subtime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
23+
+ Global.Configuration.PathImpedance_TransitCommuterRailTimeAdditiveWeight * ImpedanceRoster.GetValue("comrtime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
24+
+ Global.Configuration.PathImpedance_TransitPremiumBusTimeAdditiveWeight * ImpedanceRoster.GetValue("brttime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
25+
+ Global.Configuration.PathImpedance_TransitPATTimeAdditiveWeight * ImpedanceRoster.GetValue("pattime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable
26+
+ Global.Configuration.PathImpedance_TransitTrolleyTimeAdditiveWeight * ImpedanceRoster.GetValue("troltime", skimMode, pathType, votValue, returnTime, destinationZoneId, originZoneId).Variable;
27+
}
28+
}
29+
} //end RegionSpecificTransitImpedanceCalculation
30+
} //end class
3131
} //end namespace

‎DaySim.Customizations/DVRPC/Properties/AssemblyInfo.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Reflection;
2-
using System.Runtime.CompilerServices;
32
using System.Runtime.InteropServices;
43

54
// General Information about an assembly is controlled through the following

‎DaySim.Customizations/Fresno/ChoiceModels/Default/Models/Fresno_OtherHomeBasedTourModeModel.cs

+9-9
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
using DaySim.Framework.DomainModels.Wrappers;
44

55
namespace DaySim.ChoiceModels.Default.Models {
6-
class Fresno_OtherHomeBasedTourModeModel : OtherHomeBasedTourModeModel {
7-
protected override void RegionSpecificCustomizations(ChoiceProbabilityCalculator.Alternative alternative, ITourWrapper tour, int pathType, int mode, IParcelWrapper destinationParcel) {
8-
9-
//Global.PrintFile.WriteLine("Default Fresno_OtherHomeBasedTourModeModel.RegionSpecificCustomizations2 called");
6+
internal class Fresno_OtherHomeBasedTourModeModel : OtherHomeBasedTourModeModel {
7+
protected override void RegionSpecificCustomizations(ChoiceProbabilityCalculator.Alternative alternative, ITourWrapper tour, int pathType, int mode, IParcelWrapper destinationParcel) {
108

11-
if (mode == Global.Settings.Modes.Transit && pathType != Global.Settings.PathTypes.LightRail && pathType != Global.Settings.PathTypes.CommuterRail && pathType != Global.Settings.PathTypes.Ferry){
9+
//Global.PrintFile.WriteLine("Default Fresno_OtherHomeBasedTourModeModel.RegionSpecificCustomizations2 called");
1210

13-
//alternative.AddUtilityTerm(200 + tour.OriginParcel.District, 1);//district specific transit calibration constant
14-
//alternative.AddUtilityTerm(300 + destinationParcel.District, 1);//district specific transit calibration constant
15-
}
11+
if (mode == Global.Settings.Modes.Transit && pathType != Global.Settings.PathTypes.LightRail && pathType != Global.Settings.PathTypes.CommuterRail && pathType != Global.Settings.PathTypes.Ferry) {
12+
13+
//alternative.AddUtilityTerm(200 + tour.OriginParcel.District, 1);//district specific transit calibration constant
14+
//alternative.AddUtilityTerm(300 + destinationParcel.District, 1);//district specific transit calibration constant
15+
}
1616

1717

18-
}
1918
}
19+
}
2020
}

0 commit comments

Comments
 (0)