Merge branch 'BoobookRecognizerEtc' of https://github.com/QutEcoacous…

…tics/audio-analysis into BoobookRecognizerEtc
QutEcoacoustics · May 11, 2020 · 08de2da · 08de2da
2 parents 6f4eda6 + 16bc669
commit 08de2da
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/src/AudioAnalysisTools/Events/Types/CompositeEvent.cs b/src/AudioAnalysisTools/Events/Types/CompositeEvent.cs
@@ -57,19 +57,7 @@ public IEnumerable<ITrack> Tracks
             }
         }
 
-        public new double ScoreNormalised()
-        {
-            double sum = 0.0;
-            foreach (var @event in this.ComponentEvents)
-            {
-                sum += @event.Score;
-            }
-
-            var score = sum / this.ComponentEvents.Count;
-
-            return score / this.ScoreRange.Maximum;
-        }
-
+        public override double ScoreNormalised => this.ComponentEvents.Average()
         public override void Draw(IImageProcessingContext graphics, EventRenderingOptions options)
         {
             foreach (var @event in this.ComponentEvents)
@@ -353,4 +341,4 @@ public static double EventFractionalOverlap(AcousticEvent event1, AcousticEvent
 
         //#################################################################################################################
     }
-}
+}