Changeset 58 for trunk/tool

Show
Ignore:
Timestamp:
10/09/07 12:01:26 (15 years ago)
Author:
andreu
Message:

new aggregation method, new configuration files, corrections on the php script for graph generation.

Location:
trunk/tool
Files:
1 added
1 removed
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/tool/renetcolGUI.py

    r57 r58  
    155155        resS = 1 
    156156        resD = 1 
     157        resInIndex = 1 
     158        resOutIndex = 1 
    157159        for i in range (0, len(tpl_def[self.flow[0]])): 
    158160            f = tpl_def[self.flow[0]][i][0] 
    … …  
    166168            elif ( (f==1) and (checkUpValues[f]==1) ): 
    167169                res = res & ( (self.flow[1][i] <= ((firstParseValue[f])+((firstParseValue[f])*5/100))) and ((self.flow[1][i] >= ((firstParseValue[f])-((firstParseValue[f])*5/100)))) ) 
     170            elif ((f==10) and (checkUpValues[f]==1)): 
     171                resInIndex = resInIndex & ( self.flow[1][i] == firstParseValue[f]) 
     172            elif ((f==14) and (checkUpValues[f]==1)): 
     173                resOutIndex = resOutIndex & ( self.flow[1][i] == firstParseValue[f]) 
    168174            elif (checkUpValues[f]==1): 
    169175                res = res & (self.flow[1][i] == firstParseValue[f]) 
    170176        if ( checkUpValues[69]==1 ): 
    171177            res = res & ( (fromRouter == firstParseValue[69]) ) 
    172         res = res & (resS or resD) 
     178        res = res & (resS or resD) & (resInIndex or resOutIndex) 
    173179        return res 
    174180