Merge pull request #51 from CSDLLab/2021_06_05_add_z_scale

add z_scale to five metrics

Author: HanZhaang

config/branch_metric.json

@@ -1,6 +1,7 @@
 {
   "threshold_dis": 2,
   "threshold_mode": 1,
+  "z_scale": 1,
   "true_positive_type": 3,
   "false_negative_type": 4,
   "false_positive_type": 5

config/diadem_metric.json

@@ -7,5 +7,12 @@
   "list_distant_matches": false,
   "list_continuations": false,
   "find_proper_root": true,
+  "z_scale": 1,
+  "TRAJECTORY_NONE": -1.0,
+  "xy_threshold": 1.2,
+  "z_threshold": 0.0,
+  "default_xy_path_error_threshold": 0.05,
+  "default_z_path_error_threshold": 0.05,
+  "local_path_error_threshold": 0.4,
   "debug": false
 }

config/length_metric.json

@@ -2,5 +2,6 @@
   "rad_mode": 1,
   "rad_threshold": 1,
   "len_threshold": 0.2,
+  "z_scale": 1,
   "debug": false
 }

config/link_metric.json

@@ -1,3 +1,3 @@
 {
-
+  "z_scale": 1
 }

config/schemas/branch_metric_schema.json

@@ -4,13 +4,15 @@
   "required": [
       "threshold_dis",
       "threshold_mode",
+      "z_scale",
       "true_positive_type",
       "false_negative_type",
       "false_positive_type"
   ],
   "properties": {
     "threshold_dis": {"type": "number", "exclusiveMinimum": 0},
     "threshold_mode": {"type": "number", "enum": [1, 2]},
+    "z_scale": {"type": "number","minimum": 0},
     "true_positive_type": {"type": "integer", "exclusiveMinimum": 0},
     "false_negative_type": {"type": "integer", "exclusiveMinimum": 0},
     "false_positive_type": {"type": "integer", "exclusiveMinimum": 0}

config/schemas/diadem_metric_schema.json

@@ -13,6 +13,13 @@
     "list_distant_matches": {"type": "boolean", "default": "false"},
     "list_continuations": {"type": "boolean", "default": "false"},
     "find_proper_root": {"type": "boolean", "default": "true"},
+    "z_scale": {"type": "number", "minimum": 0},
+    "TRAJECTORY_NONE": {"type": "number"},
+    "xy_threshold": {"type": "number", "minimum": 0},
+    "z_threshold": {"type": "number", "minimum": 0},
+    "default_xy_path_error_threshold": {"type": "number", "minimum": 0},
+    "default_z_path_error_threshold": {"type": "number", "minimum": 0},
+    "local_path_error_threshold": {"type": "number", "minimum": 0},
     "debug": {"type": "boolean", "default": "false"}
   }
 }

config/schemas/length_metric_schema.json

@@ -5,12 +5,14 @@
       "rad_mode",
       "rad_threshold",
       "len_threshold",
+      "z_scale",
       "debug"
   ],
   "properties": {
     "rad_mode": {"type": "number", "enum": [1,2]},
     "rad_threshold": {"type": "number", "exclusiveMinimum": 0},
     "len_threshold": {"type": "number", "exclusiveMinimum": 0},
+    "z_scale": {"type": "number", "minimum": 0},
     "debug": {"type": "boolean"}
   }
 }

config/schemas/link_metric_schema.json

@@ -1,4 +1,10 @@
 {
   "title": "link metric schema",
-  "type": "object"
+  "type": "object",
+  "required": [
+      "z_scale"
+  ],
+  "properties": {
+    "z_scale": {"type": "number", "minimum": 0}
+  }
 }

config/schemas/ssd_metric_schema.json

@@ -5,12 +5,14 @@
       "threshold_mode",
       "ssd_threshold",
       "up_sample_threshold",
+      "z_scale",
       "debug"
   ],
   "properties": {
     "threshold_mode": {"type": "integer", "enum": [1,2]},
     "ssd_threshold": {"type": "number", "exclusiveMinimum": 0},
     "up_sample_threshold": {"type": "number", "exclusiveMinimum": 0},
+    "z_scale": {"type":"number", "minimum": 0},
     "debug": {"type": "boolean"}
   }
 }

config/ssd_metric.json

@@ -2,5 +2,6 @@
   "threshold_mode": 1,
   "ssd_threshold": 2,
   "up_sample_threshold": 1.0,
+  "z_scale": 1,
   "debug": false
 }