User:Ofriedri: Difference between revisions

From
Jump to navigation Jump to search
No edit summary
No edit summary
Line 9: Line 9:


Changed files:
Changed files:
*jist.swans.Constants
*file: jist.swans.Constants - class '''Constants'''
**added all missing possible bandwidths (2, 6, 9, 12, 18, 22, 24, 33, 36, and 48 Mbit/s)
**added all missing possible bandwidths (2, 6, 9, 12, 18, 22, 24, 33, 36, and 48 Mbit/s)
*brn.swans.mac.MacMcExOR
*file:brn.swans.mac.MacMcExORMessage.java - class '''MacMcExORMessage'''
**added class member &nbsp;<span style="font-family:Courier New; font-weight:bold">private int bitrate;</span>
**added class member &nbsp;<span style="font-family:Courier New; font-weight:bold">protected int bitrate;</span>
**added accessor method &nbsp;<span style="font-family:Courier New; font-weight:bold">public int getBitrate() { return bitrate; };</span>
**added accessor method &nbsp;<span style="font-family:Courier New; font-weight:bold">public int getBitrate() { return bitrate; };</span>
**changed method public &nbsp;<span style="font-family:Courier New; font-weight:bold">boolean equals(Object o) {}</span>
**changed method &nbsp;<span style="font-family:Courier New; font-weight:bold">public boolean equals(Object o) {}</span>
***added line &nbsp;<span style="font-family:Courier New; font-weight:bold">if (bitrate != that.bitrate) return false;<span>
***added line &nbsp;<span style="font-family:Courier New; font-weight:bold">if (bitrate != that.bitrate) return false;<span>
*file:brn.swans.mac.MacMcExORMessage.java - '''class Ack'''

**added constructor &nbsp;<span style="font-family:Courier New; font-weight:bold">Ack(..., int bitrate)<span> to include bitrate
**changed method &nbsp;<span style="font-family:Courier New; font-weight:bold">public boolean equals(Object o) {}</span>
***added line &nbsp;<span style="font-family:Courier New; font-weight:bold">if (bitrate != ack.bitrate) return false;<span>
*file:brn.swans.mac.MacMcExORMessage.java - class '''Data'''
**added constructor &nbsp;<span style="font-family:Courier New; font-weight:bold">Data(..., int bitrate)<span> to include bitrate
**changed method &nbsp;<span style="font-family:Courier New; font-weight:bold">public boolean equals(Object o) {}</span>
***added line &nbsp;<span style="font-family:Courier New; font-weight:bold">if (bitrate != data.bitrate) return false;<span>


=== Future: BER ===
=== Future: BER ===

Revision as of 13:53, 16 June 2006

BitRateSelection: Integration into JiST

First step: Quick and dirty hack into mac layer

Source code base: svn://brn-svn/brn/simulation/NetCodExOR (svn co ~)

Changed files:

  • file: jist.swans.Constants - class Constants
    • added all missing possible bandwidths (2, 6, 9, 12, 18, 22, 24, 33, 36, and 48 Mbit/s)
  • file:brn.swans.mac.MacMcExORMessage.java - class MacMcExORMessage
    • added class member  protected int bitrate;
    • added accessor method  public int getBitrate() { return bitrate; };
    • changed method  public boolean equals(Object o) {}
      • added line  if (bitrate != that.bitrate) return false;
  • file:brn.swans.mac.MacMcExORMessage.java - class Ack
    • added constructor  Ack(..., int bitrate) to include bitrate
    • changed method  public boolean equals(Object o) {}
      • added line  if (bitrate != ack.bitrate) return false;
  • file:brn.swans.mac.MacMcExORMessage.java - class Data
    • added constructor  Data(..., int bitrate) to include bitrate
    • changed method  public boolean equals(Object o) {}
      • added line  if (bitrate != data.bitrate) return false;

Future: BER

radio model has to be adapted to bit rates!!!