Browse Source

fix bug in ai/video z4

张许妍 4 years ago
parent
commit
d759bbe7d8

+ 1 - 1
backend_refactor/service/ai/video/inner_analyze.py

@@ -182,7 +182,7 @@ def analyse_npy_side_jump(data):
     result = {}
     if len(data) == 0:
         # logging.warning("Data len is not 25, skipping.")
-        return False
+        return result
 
     data = data[0]
 

+ 0 - 3
backend_refactor/service/ai/video/video_score/pingban.py

@@ -1,5 +1,4 @@
 import logging
-import sys
 
 
 def cal_ratio(measured_angle, max_angle):
@@ -48,8 +47,6 @@ def cal_second_score(list):
 
 #
 def cal_pingban(result):
-    logging.debug(result)
-    sys.stdout.write(result)
     result_ig = result
     re = {}
     # clean the data

+ 1 - 11
backend_refactor/service/video_analyzer.py

@@ -117,7 +117,6 @@ class BaseVideoAnalyzer:
 class JumpVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = cal_jump(self.results)[1]
         return classify_jump(raw)
 
@@ -125,7 +124,7 @@ class JumpVideoAnalyzer(BaseVideoAnalyzer):
 class PingbanVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
+        self.results = {k: v for k, v in self.results.items() if v != {}}
         raw = cal_pingban(self.results)[1]
         return classify_pingban(raw)
 
@@ -133,7 +132,6 @@ class PingbanVideoAnalyzer(BaseVideoAnalyzer):
 class JuanfuVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_juanfu(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = ignore_data_juanfu(self.results)[1]
         return classify_juanfu(raw)
 
@@ -141,7 +139,6 @@ class JuanfuVideoAnalyzer(BaseVideoAnalyzer):
 class ShendunVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_shendun(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = ignore_data_shendun(self.results)[1]
         return classify_shendun(raw)
 
@@ -149,7 +146,6 @@ class ShendunVideoAnalyzer(BaseVideoAnalyzer):
 class GaotaituiVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_gaotaitui(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = ignore_data_gaotaitui(self.results)[1]
         return classify_gaotaitui(raw)
 
@@ -157,7 +153,6 @@ class GaotaituiVideoAnalyzer(BaseVideoAnalyzer):
 class TurnaroundVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = cal_turnaround(self.results)[1]
         return classify_turnaround(raw)
 
@@ -165,7 +160,6 @@ class TurnaroundVideoAnalyzer(BaseVideoAnalyzer):
 class TennisthrowVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v is not False}
         raw = cal_tennisthrow(self.results)[1]
         return classify_tennisthrow(raw)
 
@@ -173,7 +167,6 @@ class TennisthrowVideoAnalyzer(BaseVideoAnalyzer):
 class JumpwithbothVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v != False}
         raw = cal_jumpwithboth(self.results)[1]
         return classify_jumpwithboth(raw)
 
@@ -181,7 +174,6 @@ class JumpwithbothVideoAnalyzer(BaseVideoAnalyzer):
 class SitforwardVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v != False}
         raw = cal_sitforward(self.results)[1]
         return classify_sitforward(raw)
 
@@ -189,7 +181,6 @@ class SitforwardVideoAnalyzer(BaseVideoAnalyzer):
 class BalancebeamVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v != False}
         raw = cal_balancebeam(self.results)[1]
         return classify_balancebeam(raw)
 
@@ -197,6 +188,5 @@ class BalancebeamVideoAnalyzer(BaseVideoAnalyzer):
 class StandingVideoAnalyzer(BaseVideoAnalyzer):
     def _do_analyze(self):
         self.results = {k: analyse_npy_side_jump(v) for k, v in self.results.items()}
-        self.results = {k: v for k, v in self.results.items() if v != False}
         raw = cal_standing(self.results)[1]
         return classify_standing(raw)