update jitter and shrp nodes

Voice-Lab · Nov 30, 2021 · 107d326 · 107d326
1 parent d9c539c
commit 107d326
Show file tree

Hide file tree

Showing 9 changed files with 174 additions and 88 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/VoiceLab.iml b/.idea/VoiceLab.iml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/Voicelab/toolkits/Voicelab/MeasureJitterNode.py b/Voicelab/toolkits/Voicelab/MeasureJitterNode.py
@@ -50,93 +50,93 @@ def process(self):
         """measure jitter"""
 
         voice = self.args["voice"]
-        #try:
-        print(self.args["Measure PCA"])
-        # Call the provided pitch bounds functions
-        pitch_floor = self.args["Pitch Floor"]
-        pitch_ceiling = self.args["Pitch Ceiling"]
-
-        start_time = self.args["start_time"]
-        end_time = self.args["end_time"]
-        shortest_period = self.args["shortest_period"]
-        longest_period = self.args["longest_period"]
-        max_period_factor = self.args["maximum_period_factor"]
-
-        point_process: object = call(
-            voice, "To PointProcess (periodic, cc)", pitch_floor, pitch_ceiling
-        )
-
-        local_jitter: float = call(
-            point_process,
-            "Get jitter (local)",
-            start_time,
-            end_time,
-            shortest_period,
-            longest_period,
-            max_period_factor,
-        )
-
-        localabsolute_jitter: float = call(
-            point_process,
-            "Get jitter (local, absolute)",
-            start_time,
-            end_time,
-            shortest_period,
-            longest_period,
-            max_period_factor,
-        )
-
-        rap_jitter: float = call(
-            point_process,
-            "Get jitter (rap)",
-            start_time,
-            end_time,
-            shortest_period,
-            longest_period,
-            max_period_factor,
-        )
-
-        ppq5_jitter: float = call(
-            point_process,
-            "Get jitter (ppq5)",
-            start_time,
-            end_time,
-            shortest_period,
-            longest_period,
-            max_period_factor,
-        )
-
-        ddp_jitter: float = call(
-            point_process,
-            "Get jitter (ddp)",
-            start_time,
-            end_time,
-            shortest_period,
-            longest_period,
-            max_period_factor,
-        )
-
-        self.state["local_jitter_list"].append(local_jitter)
-        self.state["localabsolute_jitter_list"].append(localabsolute_jitter)
-        self.state["rap_jitter_list"].append(rap_jitter)
-        self.state["ppq5_jitter_list"].append(ppq5_jitter)
-        self.state["ddp_jitter_list"].append(ddp_jitter)
-
-        return {
-            "Local Jitter": local_jitter,
-            "Local Absolute Jitter": localabsolute_jitter,
-            "RAP Jitter": rap_jitter,
-            "ppq5 Jitter": ppq5_jitter,
-            "ddp Jitter": ddp_jitter,
-        }
-        #except:
-        #    return {
-        #        "Local Jitter": "Jitter Measurement Failed",
-        #        "Local Absolute Jitter": "Jitter Measurement Failed",
-        #        "RAP Jitter": "Jitter Measurement Failed",
-        #        "ppq5 Jitter": "Jitter Measurement Failed",
-        #        "ddp Jitter": "Jitter Measurement Failed",
-        #    }
+        try:
+            print(self.args["Measure PCA"])
+            # Call the provided pitch bounds functions
+            pitch_floor = self.args["Pitch Floor"]
+            pitch_ceiling = self.args["Pitch Ceiling"]
+
+            start_time = self.args["start_time"]
+            end_time = self.args["end_time"]
+            shortest_period = self.args["shortest_period"]
+            longest_period = self.args["longest_period"]
+            max_period_factor = self.args["maximum_period_factor"]
+
+            point_process: object = call(
+                voice, "To PointProcess (periodic, cc)", pitch_floor, pitch_ceiling
+            )
+
+            local_jitter: float = call(
+                point_process,
+                "Get jitter (local)",
+                start_time,
+                end_time,
+                shortest_period,
+                longest_period,
+                max_period_factor,
+            )
+
+            localabsolute_jitter: float = call(
+                point_process,
+                "Get jitter (local, absolute)",
+                start_time,
+                end_time,
+                shortest_period,
+                longest_period,
+                max_period_factor,
+            )
+
+            rap_jitter: float = call(
+                point_process,
+                "Get jitter (rap)",
+                start_time,
+                end_time,
+                shortest_period,
+                longest_period,
+                max_period_factor,
+            )
+
+            ppq5_jitter: float = call(
+                point_process,
+                "Get jitter (ppq5)",
+                start_time,
+                end_time,
+                shortest_period,
+                longest_period,
+                max_period_factor,
+            )
+
+            ddp_jitter: float = call(
+                point_process,
+                "Get jitter (ddp)",
+                start_time,
+                end_time,
+                shortest_period,
+                longest_period,
+                max_period_factor,
+            )
+
+            self.state["local_jitter_list"].append(local_jitter)
+            self.state["localabsolute_jitter_list"].append(localabsolute_jitter)
+            self.state["rap_jitter_list"].append(rap_jitter)
+            self.state["ppq5_jitter_list"].append(ppq5_jitter)
+            self.state["ddp_jitter_list"].append(ddp_jitter)
+
+            return {
+                "Local Jitter": local_jitter,
+                "Local Absolute Jitter": localabsolute_jitter,
+                "RAP Jitter": rap_jitter,
+                "ppq5 Jitter": ppq5_jitter,
+                "ddp Jitter": ddp_jitter,
+            }
+        except:
+            return {
+                "Local Jitter": "Jitter Measurement Failed",
+                "Local Absolute Jitter": "Jitter Measurement Failed",
+                "RAP Jitter": "Jitter Measurement Failed",
+                "ppq5 Jitter": "Jitter Measurement Failed",
+                "ddp Jitter": "Jitter Measurement Failed",
+            }
 
     def jitter_pca(self):
         local_jitter_list = self.state["local_jitter_list"]

diff --git a/Voicelab/toolkits/Voicelab/MeasureSHRPNode.py b/Voicelab/toolkits/Voicelab/MeasureSHRPNode.py
@@ -40,7 +40,7 @@ def process(self):
                 "subharmonic-to-harmonic ratio": "Measurement failed",
                 "Subharmonic Mean Pitch": "Measurement failed",
                 "Subharmonic Pitch Values": "Measurement failed",
-                "Subharmonic Pitch": mean_f0.item(),
+                "Subharmonic Pitch": "Measurement failed",
             }