deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

removed old using

Browse source
This commit is contained in:
fros4943 2007-10-31 13:58:21 +00:00
parent 37bf441e40
commit e38e6b7e8c
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/cooja/java/se/sics/cooja/radiomediums/UDGM.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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; package se.sics.cooja.radiomediums;
@ -89,8 +89,6 @@ public class UDGM extends AbstractRadioMedium {
private Simulation mySimulation; private Simulation mySimulation;
private boolean usingRandom = false;
private Random random = new Random(); private Random random = new Random();
@ -397,8 +395,6 @@ public class UDGM extends AbstractRadioMedium {
// Register this radio medium's plugins // Register this radio medium's plugins
simulation.getGUI().registerTemporaryPlugin(VisUDGM.class); simulation.getGUI().registerTemporaryPlugin(VisUDGM.class);
usingRandom = false;
myRadioMedium = this; myRadioMedium = this;
mySimulation = simulation; mySimulation = simulation;
} }
@ -415,7 +411,7 @@ public class UDGM extends AbstractRadioMedium {
* (0.01 * sendingRadio.getCurrentOutputPowerIndicator()); * (0.01 * sendingRadio.getCurrentOutputPowerIndicator());
// If in random state, check if transmission fails // 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; return newConnection;
} }
@ -542,10 +538,6 @@ public class UDGM extends AbstractRadioMedium {
element.setText(Double.toString(INTERFERENCE_RANGE)); element.setText(Double.toString(INTERFERENCE_RANGE));
config.add(element); config.add(element);
element = new Element("using_random");
element.setText("" + usingRandom);
config.add(element);
element = new Element("success_ratio"); element = new Element("success_ratio");
element.setText("" + SUCCESS_RATIO); element.setText("" + SUCCESS_RATIO);
config.add(element); config.add(element);
@ -564,13 +556,6 @@ public class UDGM extends AbstractRadioMedium {
INTERFERENCE_RANGE = Double.parseDouble(element.getText()); 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")) { if (element.getName().equals("success_ratio")) {
SUCCESS_RATIO = Double.parseDouble(element.getText()); SUCCESS_RATIO = Double.parseDouble(element.getText());
} }