User:Ofriedri

From
Revision as of 12:50, 20 June 2006 by Ofriedri (talk | contribs)
Jump to navigation Jump to search

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;
Description concerned file(s) changed/added code
introducing new constants for: bandwidth jist.swans.Constants in class Constants:
public static final int BANDWIDTH_1MBit   = (int) 1e6; // 1Mb/s
public static final int BANDWIDTH_2MBit   = (int) 2e6; // 2Mb/s
public static final int BANDWIDTH_5_5MBit = (int) 5.5e6; // 5.5Mb/s
public static final int BANDWIDTH_6MBit   = (int) 6e6; // 6Mb/s
public static final int BANDWIDTH_9MBit   = (int) 9e6; // 9Mb/s
public static final int BANDWIDTH_11MBit  = (int) 11e6; // 11Mb/s
public static final int BANDWIDTH_12MBit  = (int) 12e6; // 12Mb/s
public static final int BANDWIDTH_18MBit  = (int) 18e6; // 18Mb/s
public static final int BANDWIDTH_22MBit  = (int) 22e6; // 22Mb/s
public static final int BANDWIDTH_24MBit  = (int) 24e6; // 24Mb/s
public static final int BANDWIDTH_33MBit  = (int) 33e6; // 33Mb/s
public static final int BANDWIDTH_36MBit  = (int) 36e6; // 36Mb/s
public static final int BANDWIDTH_48MBit  = (int) 48e6; // 48Mb/s
public static final int BANDWIDTH_54MBit  = (int) 54e6; // 54Mb/s


Future: BER

radio model has to be adapted to bit rates (dB values)