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

now that success ratio is variable, it must also be stored with sim configs

Browse source
This commit is contained in:
fros4943 2007-10-23 08:39:21 +00:00
parent 9f2ced9cda
commit 4a14613529
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
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.8 2007/08/21 13:31:26 fros4943 Exp $ * $Id: UDGM.java,v 1.9 2007/10/23 08:39:21 fros4943 Exp $
*/ */
package se.sics.cooja.radiomediums; package se.sics.cooja.radiomediums;
@ -80,7 +80,7 @@ public class UDGM extends AbstractRadioMedium {
public static final double SS_OK_WORST = -30; public static final double SS_OK_WORST = -30;
public static double PACKET_SUCCESS_RATIO = 1.0; private static double SUCCESS_RATIO = 1.0;
// Maximum ranges (SS indicator 100) // Maximum ranges (SS indicator 100)
private static double TRANSMITTING_RANGE = 50; private static double TRANSMITTING_RANGE = 50;
@ -164,7 +164,7 @@ public class UDGM extends AbstractRadioMedium {
interferenceModel.setMinimum(new Double(0.0)); interferenceModel.setMinimum(new Double(0.0));
SpinnerNumberModel successRatioModel = new SpinnerNumberModel(); SpinnerNumberModel successRatioModel = new SpinnerNumberModel();
successRatioModel.setValue(new Double(PACKET_SUCCESS_RATIO)); successRatioModel.setValue(new Double(SUCCESS_RATIO));
successRatioModel.setStepSize(new Double(0.01)); // 1% successRatioModel.setStepSize(new Double(0.01)); // 1%
successRatioModel.setMinimum(new Double(0.0)); successRatioModel.setMinimum(new Double(0.0));
successRatioModel.setMaximum(new Double(1.0)); successRatioModel.setMaximum(new Double(1.0));
@ -209,7 +209,7 @@ public class UDGM extends AbstractRadioMedium {
successRatioSpinner.addChangeListener(new ChangeListener() { successRatioSpinner.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
PACKET_SUCCESS_RATIO = ((SpinnerNumberModel) successRatioSpinner SUCCESS_RATIO = ((SpinnerNumberModel) successRatioSpinner
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
repaint(); repaint();
} }
@ -415,7 +415,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() > PACKET_SUCCESS_RATIO) { if (usingRandom && random.nextDouble() > SUCCESS_RATIO) {
return newConnection; return newConnection;
} }
@ -546,6 +546,10 @@ public class UDGM extends AbstractRadioMedium {
element.setText("" + usingRandom); element.setText("" + usingRandom);
config.add(element); config.add(element);
element = new Element("success_ratio");
element.setText("" + SUCCESS_RATIO);
config.add(element);
return config; return config;
} }
@ -566,6 +570,10 @@ public class UDGM extends AbstractRadioMedium {
random.setSeed(mySimulation.getRandomSeed()); random.setSeed(mySimulation.getRandomSeed());
} }
} }
if (element.getName().equals("success_ratio")) {
SUCCESS_RATIO = Double.parseDouble(element.getText());
}
} }
return true; return true;
} }