Changeset 8c48003


Ignore:
Timestamp:
Apr 2, 2009 10:07:48 PM (11 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
c7d815b
Parents:
d2fc3972 (diff), 1aa7fbb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.test' (head ef7e2c611e0eaa2f92b31c0b364d39ec023eb135)

to branch 'i2p.i2p' (head 928500dd1439f4cf359ea90cb5349bfaa7d2194b)

Location:
router/java/src/net/i2p/router
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • router/java/src/net/i2p/router/RouterContext.java

    rd2fc3972 r8c48003  
    1313import net.i2p.router.peermanager.CapacityCalculator;
    1414import net.i2p.router.peermanager.IntegrationCalculator;
    15 import net.i2p.router.peermanager.IsFailingCalculator;
    1615import net.i2p.router.peermanager.PeerManagerFacadeImpl;
    1716import net.i2p.router.peermanager.ProfileManagerImpl;
     
    6160    private RouterThrottle _throttle;
    6261    private RouterClock _clock;
    63     private Calculator _isFailingCalc;
    6462    private Calculator _integrationCalc;
    6563    private Calculator _speedCalc;
     
    129127        //_throttle = new RouterThrottleImpl(this);
    130128        _throttle = new RouterDoSThrottle(this);
    131         _isFailingCalc = new IsFailingCalculator(this);
    132129        _integrationCalc = new IntegrationCalculator(this);
    133130        _speedCalc = new SpeedCalculator(this);
     
    259256    public RouterThrottle throttle() { return _throttle; }
    260257   
    261     /** how do we rank the failure of profiles? */
    262     public Calculator isFailingCalculator() { return _isFailingCalc; }
    263258    /** how do we rank the integration of profiles? */
    264259    public Calculator integrationCalculator() { return _integrationCalc; }
     
    290285        buf.append(_shitlist).append('\n');
    291286        buf.append(_messageValidator).append('\n');
    292         buf.append(_isFailingCalc).append('\n');
    293287        buf.append(_integrationCalc).append('\n');
    294288        buf.append(_speedCalc).append('\n');
  • router/java/src/net/i2p/router/peermanager/PeerProfile.java

    rd2fc3972 r8c48003  
    443443    private double calculateCapacity() { return _context.capacityCalculator().calc(this); }
    444444    private double calculateIntegration() { return _context.integrationCalculator().calc(this); }
    445     private boolean calculateIsFailing() { return _context.isFailingCalculator().calcBoolean(this); }
     445    private boolean calculateIsFailing() { return false; }
    446446    void setIsFailing(boolean val) { _isFailing = val; }
    447447   
Note: See TracChangeset for help on using the changeset viewer.