refactor

Author: oldrev

examples/Sandwych.MapMatchingKit.Examples.HelloWorldApp/Program.cs

@@ -58,7 +58,7 @@ static void Main(string[] args)
                 var heading = cand.Point.Edge.Headeing; // heading
                 var coord = cand.Point.Coordinate; // GPS position (on the road)
                 Console.WriteLine("RoadID={0}\t\tFraction={1}", roadId, cand.Point.Fraction);
-                if (cand.Transition != null)
+                if (cand.HasTransition)
                 {
                     var geom = cand.Transition.Route.ToGeometry(); // path geometry from last matching candidate
                     Console.WriteLine("fuck");

src/Sandwych.MapMatchingKit/Markov/AbstractStateCandidate.cs

@@ -8,15 +8,41 @@ public abstract class AbstractStateCandidate<TCandidate, TTransition, TSample> :
         IStateCandidate<TCandidate, TTransition, TSample>
         where TCandidate : IStateCandidate<TCandidate, TTransition, TSample>
     {
+        private TTransition _transition;
+
         public double Seqprob { get; set; }
         public double Filtprob { get; set; }
-        public TTransition Transition { get; set; }
         public TCandidate Predecessor { get; set; }
+        public bool HasTransition { get; private set; }
+
+        public TTransition Transition
+        {
+            get
+            {
+                if (!this.HasTransition)
+                {
+                    throw new InvalidOperationException();
+                }
+                return _transition;
+            }
+            set
+            {
+                _transition = value;
+                this.HasTransition = true;
+            }
+        }
 
         public AbstractStateCandidate()
         {
         }
 
-        public abstract bool Equals(TCandidate other);
+        public virtual bool Equals(TCandidate other)
+        {
+            if (object.ReferenceEquals(this, other))
+            {
+                return true;
+            }
+            return Predecessor.Equals(other.Predecessor) && Transition.Equals(other.Transition);
+        }
     }
 }

src/Sandwych.MapMatchingKit/Markov/IStateCandidate.cs

@@ -11,5 +11,6 @@ public interface IStateCandidate<TCandidate, TTransition, TSample> : IEquatable<
         double Filtprob { get; set; }
         TCandidate Predecessor { get; set; }
         TTransition Transition { get; set; }
+        bool HasTransition { get; }
     }
 }

src/Sandwych.MapMatchingKit/Matching/MatcherCandidate.cs

@@ -6,33 +6,26 @@
 
 namespace Sandwych.MapMatchingKit.Matching
 {
-    public sealed class MatcherCandidate : IStateCandidate<MatcherCandidate, MatcherTransition, MatcherSample>
+    public sealed class MatcherCandidate : AbstractStateCandidate<MatcherCandidate, MatcherTransition, MatcherSample>
     {
         private readonly RoadPoint _point;
 
         public ref readonly RoadPoint Point => ref _point;
 
-        public double Seqprob { get; set; }
-        public double Filtprob { get; set; }
-        public MatcherCandidate Predecessor { get; set; }
-        public MatcherTransition Transition { get; set; }
-
-        public MatcherCandidate(in RoadPoint point)
+        public MatcherCandidate(in RoadPoint point) : base()
         {
             this._point = point;
         }
 
-        public override int GetHashCode() =>
-            (this.Point, this.Predecessor, this.Transition, this.Filtprob, this.Seqprob).GetHashCode();
+        public override int GetHashCode() => this.Point.GetHashCode();
 
-        public bool Equals(MatcherCandidate other)
+        public override bool Equals(MatcherCandidate other)
         {
             if (object.ReferenceEquals(this, other))
             {
                 return true;
             }
-
-            return this.Point.Equals(other.Point) && this.Predecessor.Equals(other.Predecessor) && this.Transition.Equals(other.Transition);
+            return Point.Equals(other.Point) && Predecessor.Equals(other.Predecessor) && Transition.Equals(other.Transition);
         }
     }
 }

src/Sandwych.MapMatchingKit/Matching/MatcherTransition.cs

@@ -5,7 +5,7 @@
 
 namespace Sandwych.MapMatchingKit.Matching
 {
-    public class MatcherTransition
+    public readonly struct MatcherTransition
     {
         public Route Route { get; }
 

test/Sandwych.MapMatchingKit.Tests/Markov/FilterTest.cs

@@ -8,7 +8,7 @@ namespace Sandwych.MapMatchingKit.Tests.Markov
 {
     public class FilterTest
     {
-        public class MockStateTransition
+        public struct MockStateTransition
         {
         }
 
@@ -184,12 +184,12 @@ public void FilterTestInitial()
                 if (states.Pred(element.Id) == -1)
                 {
                     Assert.Null(element.Predecessor);
-                    Assert.Null(element.Transition);
+                    Assert.False(element.HasTransition);
                 }
                 else
                 {
                     Assert.Equal(states.Pred(element.Id), element.Predecessor.Id);
-                    Assert.Null(element.Transition);
+                    Assert.False(element.HasTransition);
                 }
             }
         }
@@ -215,12 +215,12 @@ public void FilterTestSubsequent()
                 if (states.Pred(element.Id) == -1)
                 {
                     Assert.Null(element.Predecessor);
-                    Assert.Null(element.Transition);
+                    Assert.False(element.HasTransition);
                 }
                 else
                 {
                     Assert.Equal(states.Pred(element.Id), element.Predecessor.Id);
-                    Assert.NotNull(element.Transition);
+                    Assert.True(element.HasTransition);
                 }
             }
         }
@@ -246,12 +246,12 @@ public void FilterTestBreakTransition()
                 if (states.Pred(element.Id) == -1)
                 {
                     Assert.Null(element.Predecessor);
-                    Assert.Null(element.Transition);
+                    Assert.False(element.HasTransition);
                 }
                 else
                 {
                     Assert.Equal(states.Pred(element.Id), element.Predecessor.Id);
-                    Assert.NotNull(element.Transition);
+                    Assert.True(element.HasTransition);
                 }
             }
         }
@@ -277,12 +277,12 @@ public void FilterTestBreakCandidates()
                 if (states.Pred(element.Id) == -1)
                 {
                     Assert.Null(element.Predecessor);
-                    Assert.Null(element.Transition);
+                    Assert.False(element.HasTransition);
                 }
                 else
                 {
                     Assert.Equal(states.Pred(element.Id), element.Predecessor.Id);
-                    Assert.NotNull(element.Transition);
+                    Assert.True(element.HasTransition);
                 }
             }
         }

test/Sandwych.MapMatchingKit.Tests/Markov/KStateTest.cs

@@ -9,7 +9,7 @@ namespace Sandwych.MapMatchingKit.Tests.Markov
 {
     public class KStateTest
     {
-        public class MockStateTransition
+        public struct MockStateTransition
         {
         }