Correcting ratios
Browse files- FairEval.py +2 -8
    	
        FairEval.py
    CHANGED
    
    | @@ -175,8 +175,8 @@ class FairEvaluation(evaluate.Metric): | |
| 175 | 
             
                    output = {}
         | 
| 176 | 
             
                    # control the denominator for the error_format (count, proportion over total errors or over total entities)
         | 
| 177 | 
             
                    if error_format == 'count':
         | 
| 178 | 
            -
                        trad_divider = 1 | 
| 179 | 
            -
                        fair_divider = 1 | 
| 180 | 
             
                    elif error_format == 'entity_ratio':
         | 
| 181 | 
             
                        trad_divider = total_ref_entities
         | 
| 182 | 
             
                        fair_divider = total_ref_entities
         | 
| @@ -185,12 +185,6 @@ class FairEvaluation(evaluate.Metric): | |
| 185 | 
             
                        fair_divider = results['overall']['fair']['FP'] + results['overall']['fair']['FN'] + \
         | 
| 186 | 
             
                                            results['overall']['fair']['LE'] + results['overall']['fair']['BE'] + \
         | 
| 187 | 
             
                                            results['overall']['fair']['LBE']
         | 
| 188 | 
            -
                    print("trad_divider",trad_divider)
         | 
| 189 | 
            -
                    print("fair_divider",fair_divider)
         | 
| 190 | 
            -
                    trad_divider = int(trad_divider[0])
         | 
| 191 | 
            -
                    fair_divider = int(fair_divider[0])
         | 
| 192 | 
            -
                    print("trad_divider",trad_divider)
         | 
| 193 | 
            -
                    print("fair_divider",fair_divider)
         | 
| 194 |  | 
| 195 | 
             
                    # assert valid options
         | 
| 196 | 
             
                    assert mode in ['traditional', 'fair', 'weighted'], 'mode must be \'traditional\', \'fair\' or \'weighted\''
         | 
|  | |
| 175 | 
             
                    output = {}
         | 
| 176 | 
             
                    # control the denominator for the error_format (count, proportion over total errors or over total entities)
         | 
| 177 | 
             
                    if error_format == 'count':
         | 
| 178 | 
            +
                        trad_divider = 1
         | 
| 179 | 
            +
                        fair_divider = 1
         | 
| 180 | 
             
                    elif error_format == 'entity_ratio':
         | 
| 181 | 
             
                        trad_divider = total_ref_entities
         | 
| 182 | 
             
                        fair_divider = total_ref_entities
         | 
|  | |
| 185 | 
             
                        fair_divider = results['overall']['fair']['FP'] + results['overall']['fair']['FN'] + \
         | 
| 186 | 
             
                                            results['overall']['fair']['LE'] + results['overall']['fair']['BE'] + \
         | 
| 187 | 
             
                                            results['overall']['fair']['LBE']
         | 
|  | |
|  | |
|  | |
|  | |
|  | |
|  | |
| 188 |  | 
| 189 | 
             
                    # assert valid options
         | 
| 190 | 
             
                    assert mode in ['traditional', 'fair', 'weighted'], 'mode must be \'traditional\', \'fair\' or \'weighted\''
         | 

