From 0e5c0b66a52c139e67b2f45f6b02a4c2b87b919c Mon Sep 17 00:00:00 2001
From: Michael Shamash <michael@shamash.me>
Date: Sat, 2 Apr 2022 11:35:16 -0400
Subject: [PATCH] Changed default thresholds

---
 OnePetri/Base.lproj/Main.storyboard                   | 8 ++++----
 OnePetri/Controllers/CountPlaquesViewController.swift | 4 ++--
 OnePetri/Controllers/SelectImageViewController.swift  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/OnePetri/Base.lproj/Main.storyboard b/OnePetri/Base.lproj/Main.storyboard
index 7bde28d..2d44173 100644
--- a/OnePetri/Base.lproj/Main.storyboard
+++ b/OnePetri/Base.lproj/Main.storyboard
@@ -492,7 +492,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.40" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LRH-Ha-bLP">
+                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.50" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LRH-Ha-bLP">
                                                 <rect key="frame" x="210" y="0.0" width="60" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="60" id="ARw-06-1IF"/>
@@ -514,7 +514,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.10" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bk2-Mi-xio">
+                                            <textField opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.35" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bk2-Mi-xio">
                                                 <rect key="frame" x="210" y="0.0" width="60" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="60" id="0R0-WS-e6G"/>
@@ -550,7 +550,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.85" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BQD-dV-mOG">
+                                            <textField opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.70" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BQD-dV-mOG">
                                                 <rect key="frame" x="210" y="0.0" width="60" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="60" id="Awu-du-yka"/>
@@ -572,7 +572,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.25" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gc3-4y-9Vp">
+                                            <textField opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.55" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gc3-4y-9Vp">
                                                 <rect key="frame" x="210" y="0.0" width="60" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="60" id="aA4-7C-mZM"/>
diff --git a/OnePetri/Controllers/CountPlaquesViewController.swift b/OnePetri/Controllers/CountPlaquesViewController.swift
index 221f66a..1ad24a8 100644
--- a/OnePetri/Controllers/CountPlaquesViewController.swift
+++ b/OnePetri/Controllers/CountPlaquesViewController.swift
@@ -71,8 +71,8 @@ class CountPlaquesViewController: UIViewController {
             let defaults = UserDefaults.standard
             let plaqueConfThreshold = defaults.double(forKey: "PlaqueConfThreshold")
             let plaqueIOUThreshold = defaults.double(forKey: "PlaqueIOUThreshold")
-            confThreshold = (plaqueConfThreshold != 0.0 ? plaqueConfThreshold : 0.85)
-            iouThreshold = (plaqueIOUThreshold != 0.0 ? plaqueIOUThreshold : 0.25)
+            confThreshold = (plaqueConfThreshold != 0.0 ? plaqueConfThreshold : 0.70)
+            iouThreshold = (plaqueIOUThreshold != 0.0 ? plaqueIOUThreshold : 0.55)
             
             let tileTuple = petriDishImage.tileImageDynamically(networkSize: modelImgSize)
             tileArray = tileTuple.0
diff --git a/OnePetri/Controllers/SelectImageViewController.swift b/OnePetri/Controllers/SelectImageViewController.swift
index b4171be..b72b7cc 100644
--- a/OnePetri/Controllers/SelectImageViewController.swift
+++ b/OnePetri/Controllers/SelectImageViewController.swift
@@ -50,8 +50,8 @@ class SelectImageViewController: UIViewController {
         let defaults = UserDefaults.standard
         let petriConfThreshold = defaults.double(forKey: "PetriConfThreshold")
         let petriIOUThreshold = defaults.double(forKey: "PetriIOUThreshold")
-        confThreshold = (petriConfThreshold != 0.0 ? petriConfThreshold : 0.40)
-        iouThreshold = (petriIOUThreshold != 0.0 ? petriIOUThreshold : 0.10)
+        confThreshold = (petriConfThreshold != 0.0 ? petriConfThreshold : 0.50)
+        iouThreshold = (petriIOUThreshold != 0.0 ? petriIOUThreshold : 0.35)
         
         // setup Vision parts
         setupLayers()