Final touch ups

Author: markgalvan-intel

IntelPresentMon/Interprocess/source/metadata/EnumStat.h

@@ -17,5 +17,5 @@
 		X_(STAT, MID_LERP, "Mid Lerp", "mlp", "Linear interpolation between the two observations nearest to the middle of the sliding window") \
 		X_(STAT, NEWEST_POINT, "Newest Point", "npt", "Value in the most recent observation in the sliding window") \
 		X_(STAT, OLDEST_POINT, "Oldest Point", "opt", "Value in the least recent observation in the sliding window") \
-		X_(STAT, COUNT, "Count", "cnt", "Count of observations in the sliding window matching a predicate (e.g. counting # of observations for which a field is boolean true)")
-		X_(STAT, NON_ZERO_AVG, "Non-zero Average", (const char*)u8"øavg", "Average or mean of frame samples over the sliding window, excluding all zero values")
+		X_(STAT, COUNT, "Count", "cnt", "Count of observations in the sliding window matching a predicate (e.g. counting # of observations for which a field is boolean true)") \
+		X_(STAT, NON_ZERO_AVG, "Non-zero Average", (const char*)u8"øavg", "Average or mean of frame samples over the sliding window, excluding all zero values")

IntelPresentMon/PMInstaller/PresentMon.wxs

@@ -4,7 +4,7 @@
         Id="*"
         Name="Intel(R) PresentMon"
         Language="1033"
-        Version="0.7.0.0"
+        Version="2.0.0.0"
         Manufacturer="Intel(R) Corporation"
         UpgradeCode="CD0D489E-0FE7-452D-90D9-F94F3F5FF410">
 

IntelPresentMon/PresentMonMiddleware/source/ConcreteMiddleware.cpp

@@ -7,6 +7,7 @@
 #include <cassert>
 #include <cstdlib>
 #include <Shlwapi.h>
+#include <numeric>
 #include "../../PresentMonUtils/NamedPipeHelper.h"
 #include "../../PresentMonUtils/QPCUtils.h"
 #include "../../PresentMonAPI2/Internal.h"
@@ -1126,6 +1127,13 @@ void ReportMetrics(
                 output /= inData.size();
                 return;
             }
+            else if (stat == PM_STAT_NON_ZERO_AVG)
+            {
+                std::vector<double> non_zero_data;
+                std::copy_if(inData.begin(), inData.end(), std::back_inserter(non_zero_data),
+                    [](double value) { return value != 0.0; });
+                output = !non_zero_data.empty() ? std::accumulate(non_zero_data.begin(), non_zero_data.end(), 0.0) / non_zero_data.size() : 0.0;
+            }
             else if (stat == PM_STAT_MID_POINT)
             {
                 size_t middle_index = inData.size() / 2;

IntelPresentMon/Streamer/StreamClient.cpp

@@ -228,7 +228,7 @@ const PmNsmFrameData* StreamClient::PeekPreviousFrame()
 
 PM_STATUS StreamClient::ConsumePtrToNextNsmFrameData(const PmNsmFrameData** pNsmData)
 {
-    if (*pNsmData == nullptr) {
+    if (pNsmData == nullptr) {
         return PM_STATUS::PM_STATUS_FAILURE;
     }