Fixed .csv reading, now correctly finds ground truth in input folder if it...

Fixed .csv reading, now correctly finds ground truth in input folder if it exists. Changed notation to 'groundTruth_[file]'

src/openCV/main.cpp

@@ -20,7 +20,7 @@ ofstream createCSV(filesystem::path videoFilePath);
 //    and returns true for when the ratio of the sum of those changes is sufficiently large.
 bool detectChange(Mat firstFrame, Mat secFrame);
 
-double percentChangeThreshold = 0.001;
+double percentChangeThreshold = 0.00001;
 
 int main(int argc, char** argv) {
   if (argc != 2) {
@@ -41,7 +41,7 @@ int main(int argc, char** argv) {
   VideoCapture decoder(videoPath.string());
   auto start = chrono::steady_clock::now();
 
-  int detectionsPerSec = 3;
+  int detectionsPerSec = 2;
 
   // Amount of extra time each detection interval will be padded with.
   double paddingTime_s = 1;
@@ -66,7 +66,7 @@ int main(int argc, char** argv) {
   Mat binaryNextFrame;
   Mat medianBlurFrame;    
   Mat medianBlurNextFrame;
-  int blurRadius = 5;
+  int blurRadius = 9;
 
   int32_t height = decoder.get(CAP_PROP_FRAME_HEIGHT);
   int32_t width  = decoder.get(CAP_PROP_FRAME_WIDTH);

src/python/RunDetection.py

@@ -27,7 +27,7 @@ def main(inputVideo):
             print("No input folder found. Creating it now. Place input video files in that folder.")
             return
         print("Processing file {file}".format(file=inputVideo))
-        #os.system("opencvtest.exe {input}".format(input="input/{file}".format(file=inputVideo)))
+        os.system("opencvtest.exe {input}".format(input="input/{file}".format(file=inputVideo)))
 
         prefix, ext = os.path.splitext(inputVideo)
         print("\nVideo processed and outputted to {csv}.".format(csv=prefix+".csv"))

src/python/VideoTrimmer.py

@@ -49,20 +49,23 @@ def doesGroundTruthExist(groundTruthInput):
     for file in os.listdir():
         if file == groundTruthInput:
             return True
-        else:
     return False
 
 def readForCSV(inputVideoName):
+    inputNoExt = os.path.splitext(inputVideoName)[0]
     os.chdir("input")
     if inputVideoName in os.listdir():
         #   Checks if there is a .csv in the directory. If there is, tries to trim according to timestamps.
         #   Expects even-sized appropriately timed timestamps in seconds of the input video.
         #   Example: {5, 33, 106, 180} -> Two intervals of length 28 and 74 seconds respectively.
         videoFound = False
-        groundTruthName = "groundTruth" + os.path.splitext(inputVideoName)[0] + ".csv"
+        groundTruthName = "groundTruth_" + inputNoExt + ".csv"
+ 
         for file in os.listdir():
-            if file != groundTruthName and file.endswith(".csv"):
+            if os.path.splitext(file)[0] == inputNoExt and file.endswith(".csv"):
                 videoFound = True
+                print(".csv file with same name as input video found")
+
                 with open(file) as csvFile:
                     reader = csv.reader(csvFile, delimiter=",")