#14: Increase code quality with the Codacy service

Author: Timur Gilmullin

FuzzyClassificator.py

@@ -26,8 +26,8 @@ def Version(onlyPrint=False):
     try:
         version = pkg_resources.get_distribution('FuzzyClassificator').version
 
-    except:
-        version = 'unknown'
+    except Exception:
+        return 'unknown'
 
     if onlyPrint:
         FCLogger.level = 50

FuzzyRoutines.py

@@ -32,23 +32,18 @@ def DiapasonParser(diapason):
         for element in diapason.split(','):
             fullDiapason += [x for x in range(int(element.split('-')[0]), int(element.split('-')[-1]) + 1)]
 
-    except:
+    except Exception:
         FCLogger.error('"{}" is not correct diapason string!'.format(diapason))
-        fullDiapason = []
+        return []
 
-    finally:
-        return sorted(list(set(fullDiapason)))
+    return sorted(list(set(fullDiapason)))
 
 
 def IsNumber(value):
     """
-    Return True if value is float or integer number. 
+    Return True if value is float or integer number.
     """
-    if not isinstance(value, bool) and (isinstance(value, int) or isinstance(value, float)):
-        return True
-
-    else:
-        return False
+    return bool(not isinstance(value, bool) and (isinstance(value, int) or isinstance(value, float)))
 
 
 def IsCorrectFuzzyNumberValue(value):
@@ -297,13 +292,12 @@ def Hyperbolic(self, x):
                 result = 1 / (1 + (a * (x - c)) ** b)
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Hyperbolic membership function use real inputs x and parameters a, b, c.')
             FCLogger.error('Your inputs: mju_hyperbolic({}, {}, {}, {})'.format(x, a, b, c))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Bell(self, x):
         """
@@ -335,13 +329,12 @@ def Bell(self, x):
                 self._parameters['b'] = bOld
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Bell membership function use real inputs x and parameters a, b, c.')
             FCLogger.error('Your inputs: mju_bell({}, {}, {}, {})'.format(x, a, b, c))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Parabolic(self, x):
         """
@@ -366,13 +359,12 @@ def Parabolic(self, x):
                 result = 1
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Parabolic membership function use real inputs x and parameters a, b.')
             FCLogger.error('Your inputs: mju_parabolic({}, {}, {})'.format(x, a, b))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Triangle(self, x):
         """
@@ -398,13 +390,12 @@ def Triangle(self, x):
                 result = 0
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Triangle membership function use real inputs x and parameters a, b, c.')
             FCLogger.error('Your inputs: mju_triangle({}, {}, {}, {})'.format(x, a, b, c))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Trapezium(self, x):
         """
@@ -434,13 +425,12 @@ def Trapezium(self, x):
                 result = 0
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Trapezium membership function use real inputs x and parameters a, b, c, d.')
             FCLogger.error('Your inputs: mju_trapezium({}, {}, {}, {}, {})'.format(x, a, b, c, d))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Exponential(self, x):
         """
@@ -456,13 +446,12 @@ def Exponential(self, x):
                 result = math.exp(1) ** (-0.5 * ((x - a) / b) ** 2)
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Exponential membership function use real inputs x and parameters a, b.')
             FCLogger.error('Your inputs: mju_exponential({}, {}, {})'.format(x, a, b))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Sigmoidal(self, x):
         """
@@ -477,13 +466,12 @@ def Sigmoidal(self, x):
             result = 1 / (1 + math.exp(1) ** (-a * (x - b)))
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error('Sigmoidal membership function use real inputs x and parameters a, b.')
             FCLogger.error('Your inputs: mju_sigmoidal({}, {}, {})'.format(x, a, b))
+            return 0
 
-        finally:
-            return result
+        return result
 
     def Desirability(self, y):
         """
@@ -495,13 +483,12 @@ def Desirability(self, y):
             result = math.exp(-math.exp(-y))
 
         except:
-            result = 0
             FCLogger.error(traceback.format_exc())
             FCLogger.error("Harrington's desirability membership function use only real input y without any parameters.")
             FCLogger.error('Your inputs: mju_desirability({})'.format(y))
+            return 0
 
-        finally:
-            return result
+        return result
 
 
 class FuzzySet():
@@ -646,7 +633,7 @@ def __str__(self):
         for level in self._levels[1:]:
             allLevelsName += ', {}'.format(level['name'])
             allLevels += '\n    {}'.format(str(level['fSet']))
-        
+
         scaleView = '{} = {{{}}}{}'.format(self._name, allLevelsName, allLevels)
 
         return scaleView

PyBrainLearning.py

@@ -94,7 +94,7 @@ def DefuzRawData(self):
 
                 defuzData.append(defuzValues)
 
-        except:
+        except Exception:
             defuzData = []
             FCLogger.error(traceback.format_exc())
             FCLogger.error('An error occurred while defuzzyficating values in raw data!')
@@ -747,8 +747,6 @@ def Train(self):
         """
         Realize training mechanism.
         """
-        noTrainErrors = True  # successful train flag
-
         try:
             if self._epochs > 0:
                 if self.trainer:
@@ -853,12 +851,11 @@ def Train(self):
                 FCLogger.warning('Epoch of learning count is 0. Train not run!')
 
         except:
-            noTrainErrors = False
             FCLogger.error(traceback.format_exc())
             FCLogger.error('An error occurred while Training Fuzzy Network!')
+            return False
 
-        finally:
-            return noTrainErrors
+        return True
 
     def CreateReport(self, results=None, fuzzyOutput=True):
         """
@@ -868,8 +865,6 @@ def CreateReport(self, results=None, fuzzyOutput=True):
         """
         FCLogger.debug('Creating Classificate Report File...')
 
-        noReportCreationErrors = True  # successful of Creating Report process flag
-
         try:
             if not results:
                 results = self.ClassificationResults(fullEval=True, needFuzzy=fuzzyOutput)
@@ -895,12 +890,11 @@ def CreateReport(self, results=None, fuzzyOutput=True):
             FCLogger.info('Classificate Report File created: ' + os.path.abspath(self.reportFile))
 
         except:
-            noReportCreationErrors = False
             FCLogger.error(traceback.format_exc())
             FCLogger.error('An error occurred while Classificate Report creating!')
+            return False
 
-        finally:
-            return noReportCreationErrors
+        return True
 
 
 if __name__ == "__main__":