removed old using
This commit is contained in:
parent
37bf441e40
commit
e38e6b7e8c
|
@ -26,7 +26,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: UDGM.java,v 1.9 2007/10/23 08:39:21 fros4943 Exp $
|
||||
* $Id: UDGM.java,v 1.10 2007/10/31 13:58:21 fros4943 Exp $
|
||||
*/
|
||||
|
||||
package se.sics.cooja.radiomediums;
|
||||
|
@ -89,8 +89,6 @@ public class UDGM extends AbstractRadioMedium {
|
|||
|
||||
private Simulation mySimulation;
|
||||
|
||||
private boolean usingRandom = false;
|
||||
|
||||
private Random random = new Random();
|
||||
|
||||
|
||||
|
@ -397,8 +395,6 @@ public class UDGM extends AbstractRadioMedium {
|
|||
// Register this radio medium's plugins
|
||||
simulation.getGUI().registerTemporaryPlugin(VisUDGM.class);
|
||||
|
||||
usingRandom = false;
|
||||
|
||||
myRadioMedium = this;
|
||||
mySimulation = simulation;
|
||||
}
|
||||
|
@ -415,7 +411,7 @@ public class UDGM extends AbstractRadioMedium {
|
|||
* (0.01 * sendingRadio.getCurrentOutputPowerIndicator());
|
||||
|
||||
// If in random state, check if transmission fails
|
||||
if (usingRandom && random.nextDouble() > SUCCESS_RATIO) {
|
||||
if (SUCCESS_RATIO < 1.0 && random.nextDouble() > SUCCESS_RATIO) {
|
||||
return newConnection;
|
||||
}
|
||||
|
||||
|
@ -542,10 +538,6 @@ public class UDGM extends AbstractRadioMedium {
|
|||
element.setText(Double.toString(INTERFERENCE_RANGE));
|
||||
config.add(element);
|
||||
|
||||
element = new Element("using_random");
|
||||
element.setText("" + usingRandom);
|
||||
config.add(element);
|
||||
|
||||
element = new Element("success_ratio");
|
||||
element.setText("" + SUCCESS_RATIO);
|
||||
config.add(element);
|
||||
|
@ -564,13 +556,6 @@ public class UDGM extends AbstractRadioMedium {
|
|||
INTERFERENCE_RANGE = Double.parseDouble(element.getText());
|
||||
}
|
||||
|
||||
if (element.getName().equals("using_random")) {
|
||||
usingRandom = Boolean.parseBoolean(element.getText());
|
||||
if (usingRandom) {
|
||||
random.setSeed(mySimulation.getRandomSeed());
|
||||
}
|
||||
}
|
||||
|
||||
if (element.getName().equals("success_ratio")) {
|
||||
SUCCESS_RATIO = Double.parseDouble(element.getText());
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue