Added selected_link_volumes option for SOLA Path Analysis (#276)

Author: JamesVaughan

Code/TMG.Emme/NetworkAssignment/MultiClassRoadAssignment.cs

@@ -137,9 +137,12 @@ public class Analysis : IModule
             [RunParameter("Attribute ID", "", "The attribute to use for analysis.")]
             public string AttributeId;
 
-            [RunParameter("Aggregation Matrix", 0, "The matrix number to store the results into.")]
+            [RunParameter("Aggregation Matrix", 0, "The matrix number to store the results into. Leave 0 to not apply.")]
             public int AggregationMatrix;
 
+            [RunParameter("Selected Link Volumes", "", "The name of the link attribute to store the results into. Leave blank to not apply.")]
+            public string SelectedLinkVolumes;
+
             [RunParameter("Operator", "+", "The operator to use to aggregate the matrix. Example:'+' for emissions, 'max' for select link analysis")]
             public string AggregationOperator;
 
@@ -169,12 +172,6 @@ public bool RuntimeValidation(ref string error)
                     error = $"In {Name} the attribute ID was not valid!";
                     return false;
                 }
-                if (AggregationMatrix <= 0)
-                {
-                    error = $"In {Name} the aggregation matrix number was invalid!";
-                    return false;
-                }
-
                 return true;
             }
         }
@@ -222,6 +219,7 @@ private ModellerControllerParameter[] GetParameters()
             new ModellerControllerParameter("ResultAttributes", string.Join(",", Classes.Select(c => c.VolumeAttribute))),
             new ModellerControllerParameter("xtmf_AnalysisAttributes", GetAttributesFromClass()),
             new ModellerControllerParameter("xtmf_AnalysisAttributesMatrixId", GetAttributeMatrixIds()),
+            new ModellerControllerParameter("xtmf_AnalysisSelectedLinkVolumes", GetelectedLinkVolumes()),
             new ModellerControllerParameter("xtmf_AggregationOperator", GetAggregationOperator()),
             new ModellerControllerParameter("xtmf_LowerBound", GetLowerBound()),
             new ModellerControllerParameter("xtmf_UpperBound", GetUpperBound()),
@@ -247,6 +245,13 @@ select string.Join(",", from at in c.PathAnalyses
                                                         select "mf" + at.AggregationMatrix));
     }
 
+    private string GetelectedLinkVolumes()
+    {
+        return string.Join("|", from c in Classes
+                                select string.Join(",", from at in c.PathAnalyses
+                                                        select at.SelectedLinkVolumes));
+    }
+
     private string GetAggregationOperator()
     {
         return string.Join("|", from c in Classes