Merge pull request #35 from msthoma/evaluation_3

Bug fixes
CYENS · Feb 15, 2021 · 0a604e5 · 0a604e5
2 parents f14c4f7 + 631f9f9
commit 0a604e5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/assets/CHANGELOG.md b/assets/CHANGELOG.md
@@ -1,3 +1,6 @@
+## Version 0.12.1 (2021-02-15)
+- Bug fixes
+
 ## Version 0.12.0 (2021-02-15)
 - Preparations for app evaluation
 - Added message in camera view informing the user if no artworks are identified

diff --git a/lib/tensorflow/model_selection.dart b/lib/tensorflow/model_selection.dart
@@ -37,7 +37,7 @@ class _ModelSelectionState extends State<ModelSelection>
   String _fps = "";
   String _model = "";
   double _preferredSensitivity = 0.0;
-  bool _navigateToDetails = false;
+  bool _navigateToDetails = true;
 
   // bool addedViewing = false;
   var currentAlgorithm;
@@ -116,7 +116,7 @@ class _ModelSelectionState extends State<ModelSelection>
 
     // determine from settings whether to automatically navigate to an artwork's
     // details when a recognition occurs
-    bool navigateToDetails = Settings.getValue(keyNavigateToDetails, false);
+    bool navigateToDetails = Settings.getValue(keyNavigateToDetails, true);
 
     setState(() {
       _model = preferredModel;
@@ -193,9 +193,11 @@ class _ModelSelectionState extends State<ModelSelection>
                 _model = "";
                 Navigator.push(
                   context,
-                  MaterialPageRoute(builder: (context) {
-                    return ArtworkDetailsPage(artwork: artwork);
-                  }),
+                  MaterialPageRoute(
+                    builder: (context) {
+                      return ArtworkDetailsPage(artwork: artwork);
+                    },
+                  ),
                 ).then((_) {
                   // re-initialize model when user is back to this screen
                   initModel();

diff --git a/lib/ui/pages/settings_page.dart b/lib/ui/pages/settings_page.dart
@@ -151,7 +151,7 @@ class _SettingsPageState extends State<SettingsPage> {
                     leading: Icon(Icons.adjust),
                     title: "CNN sensitivity",
                     settingKey: keyCnnSensitivity,
-                    defaultValue: 80.0,
+                    defaultValue: 75.0,
                     min: 0.0,
                     max: 100.0,
                     step: 0.2,
@@ -163,7 +163,7 @@ class _SettingsPageState extends State<SettingsPage> {
                     leading: Icon(Icons.space_bar),
                     title: _getCurrentWinThreshPName(),
                     settingKey: keyWinThreshP,
-                    defaultValue: 8,
+                    defaultValue: 6,
                     min: 5,
                     max: 50,
                     step: 1,
@@ -189,9 +189,9 @@ class _SettingsPageState extends State<SettingsPage> {
                     ),
                   ),
                 ],
-              )
+              ),
             ],
-          )
+          ),
         ],
       ),
     );
@@ -210,22 +210,22 @@ void _setDefaultAlgorithmSettings(String algorithmName) {
 Map<String, dynamic> defaultSettings(String algorithmName) {
   return {
     firstAlgorithm: {
-      keyCnnSensitivity: 80.0,
-      keyWinThreshP: 8.0,
+      keyCnnSensitivity: 75.0,
+      keyWinThreshP: 6.0,
       keyWinThreshPName: "Window length",
     },
     secondAlgorithm: {
-      keyCnnSensitivity: 80.0,
+      keyCnnSensitivity: 75.0,
       keyWinThreshP: 10.0,
       keyWinThreshPName: "Window length",
     },
     thirdAlgorithm: {
-      keyCnnSensitivity: 80.0,
+      keyCnnSensitivity: 75.0,
       keyWinThreshP: 10.0,
       keyWinThreshPName: "Count threshold"
     },
     fourthAlgorithm: {
-      keyCnnSensitivity: 80.0,
+      keyCnnSensitivity: 75.0,
       keyWinThreshP: 15.0,
       keyWinThreshPName: "P",
     },

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 0.12.0+1
+version: 0.12.1+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"