Decreased default plaque detection thresholds (conf & NMS IOU)

mshamash · Jul 17, 2021 · 92a7e0e · 92a7e0e
1 parent be1ea43
commit 92a7e0e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/OnePetri/Base.lproj/Main.storyboard b/OnePetri/Base.lproj/Main.storyboard
@@ -403,8 +403,8 @@
                                     <action selector="didTapSettings:" destination="kxU-si-2fA" eventType="touchUpInside" id="oOE-Jf-Imk"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 0.0.0-b0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fcy-8z-i9q">
-                                <rect key="frame" x="13.000000000000007" y="859.66666666666663" width="120.66666666666669" height="19.333333333333371"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Version 0.0.0-0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fcy-8z-i9q">
+                                <rect key="frame" x="13" y="859.66666666666663" width="111" height="19.333333333333371"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <color key="textColor" red="0.43431191929836865" green="0.43431191929836865" blue="0.43431191929836865" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                                 <nil key="highlightedColor"/>
@@ -533,7 +533,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"/>
@@ -577,7 +577,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.65" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="z9e-lB-1cz">
+                                            <textField opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="0.55" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="z9e-lB-1cz">
                                                 <rect key="frame" x="210" y="0.0" width="60" height="34"/>
                                                 <constraints>
                                                     <constraint firstAttribute="width" constant="60" id="LLy-Pv-dSZ"/>

diff --git a/OnePetri/Controllers/CountPlaquesViewController.swift b/OnePetri/Controllers/CountPlaquesViewController.swift
@@ -50,9 +50,9 @@ class CountPlaquesViewController: UIViewController {
         let plaqueConfThreshold = defaults.double(forKey: "PlaqueConfThreshold")
         let plaqueIOUThreshold = defaults.double(forKey: "PlaqueIOUThreshold")
         let plaqueNMSIOUThreshold = defaults.double(forKey: "PlaqueNMSIOUThreshold")
-        confThreshold = (plaqueConfThreshold != 0.0 ? plaqueConfThreshold : 0.85)
+        confThreshold = (plaqueConfThreshold != 0.0 ? plaqueConfThreshold : 0.70)
         iouThreshold = (plaqueIOUThreshold != 0.0 ? plaqueIOUThreshold : 0.85)
-        nmsIOUThreshold = (plaqueNMSIOUThreshold != 0.0 ? plaqueNMSIOUThreshold : 0.65)
+        nmsIOUThreshold = (plaqueNMSIOUThreshold != 0.0 ? plaqueNMSIOUThreshold : 0.55)
 
         self.textView.text = "Detecting plaques..."
         self.backToAssayButton.isHidden = true