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

using two random success ratios

Browse source
This commit is contained in:
fros4943 2007-12-13 07:59:35 +00:00
parent 98b2bd7de8
commit 829849dbc9
1 changed files with 72 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

99
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.11 2007/11/20 05:19:47 fros4943 Exp $ * $Id: UDGM.java,v 1.12 2007/12/13 07:59:35 fros4943 Exp $
*/ */
package se.sics.cooja.radiomediums; package se.sics.cooja.radiomediums;
@ -80,7 +80,9 @@ public class UDGM extends AbstractRadioMedium {
public static final double SS_OK_WORST = -30; public static final double SS_OK_WORST = -30;
private static double SUCCESS_RATIO = 1.0; private static double SUCCESS_RATIO_TX = 1.0;
private static double SUCCESS_RATIO_RX = 1.0;
// Maximum ranges (SS indicator 100) // Maximum ranges (SS indicator 100)
private static double TRANSMITTING_RANGE = 50; private static double TRANSMITTING_RANGE = 50;
@ -111,7 +113,9 @@ public class UDGM extends AbstractRadioMedium {
private JSpinner interferenceSpinner = null; private JSpinner interferenceSpinner = null;
private JSpinner successRatioSpinner = null; private JSpinner successRatioTxSpinner = null;
private JSpinner successRatioRxSpinner = null;
private Observer radioMediumObserver; private Observer radioMediumObserver;
@ -141,7 +145,8 @@ public class UDGM extends AbstractRadioMedium {
} }
public void doAction(Mote mote) { public void doAction(Mote mote) {
successRatioSpinner.setVisible(true); successRatioTxSpinner.setVisible(true);
successRatioRxSpinner.setVisible(true);
repaint(); repaint();
} }
}; };
@ -161,11 +166,17 @@ public class UDGM extends AbstractRadioMedium {
interferenceModel.setStepSize(new Double(1.0)); // 1m interferenceModel.setStepSize(new Double(1.0)); // 1m
interferenceModel.setMinimum(new Double(0.0)); interferenceModel.setMinimum(new Double(0.0));
SpinnerNumberModel successRatioModel = new SpinnerNumberModel(); SpinnerNumberModel successRatioTxModel = new SpinnerNumberModel();
successRatioModel.setValue(new Double(SUCCESS_RATIO)); successRatioTxModel.setValue(new Double(SUCCESS_RATIO_TX));
successRatioModel.setStepSize(new Double(0.01)); // 1% successRatioTxModel.setStepSize(new Double(0.001)); // 0.1%
successRatioModel.setMinimum(new Double(0.0)); successRatioTxModel.setMinimum(new Double(0.0));
successRatioModel.setMaximum(new Double(1.0)); successRatioTxModel.setMaximum(new Double(1.0));
SpinnerNumberModel successRatioRxModel = new SpinnerNumberModel();
successRatioRxModel.setValue(new Double(SUCCESS_RATIO_RX));
successRatioRxModel.setStepSize(new Double(0.001)); // 0.1%
successRatioRxModel.setMinimum(new Double(0.0));
successRatioRxModel.setMaximum(new Double(1.0));
JSpinner.NumberEditor editor; JSpinner.NumberEditor editor;
transmissionSpinner = new JSpinner(transmissionModel); transmissionSpinner = new JSpinner(transmissionModel);
@ -174,20 +185,26 @@ public class UDGM extends AbstractRadioMedium {
interferenceSpinner = new JSpinner(interferenceModel); interferenceSpinner = new JSpinner(interferenceModel);
editor = new JSpinner.NumberEditor(interferenceSpinner, "0m"); editor = new JSpinner.NumberEditor(interferenceSpinner, "0m");
interferenceSpinner.setEditor(editor); interferenceSpinner.setEditor(editor);
successRatioSpinner = new JSpinner(successRatioModel); successRatioTxSpinner = new JSpinner(successRatioTxModel);
editor = new JSpinner.NumberEditor(successRatioSpinner, "0%"); editor = new JSpinner.NumberEditor(successRatioTxSpinner, "0.0%");
successRatioSpinner.setEditor(editor); successRatioTxSpinner.setEditor(editor);
successRatioRxSpinner = new JSpinner(successRatioRxModel);
editor = new JSpinner.NumberEditor(successRatioRxSpinner, "0.0%");
successRatioRxSpinner.setEditor(editor);
((JSpinner.DefaultEditor) transmissionSpinner.getEditor()).getTextField() ((JSpinner.DefaultEditor) transmissionSpinner.getEditor()).getTextField()
.setColumns(5); .setColumns(5);
((JSpinner.DefaultEditor) interferenceSpinner.getEditor()).getTextField() ((JSpinner.DefaultEditor) interferenceSpinner.getEditor()).getTextField()
.setColumns(5); .setColumns(5);
((JSpinner.DefaultEditor) successRatioSpinner.getEditor()).getTextField() ((JSpinner.DefaultEditor) successRatioTxSpinner.getEditor()).getTextField()
.setColumns(5); .setColumns(5);
transmissionSpinner.setToolTipText("Transmitting range"); ((JSpinner.DefaultEditor) successRatioRxSpinner.getEditor()).getTextField()
interferenceSpinner.setToolTipText("Interference range"); .setColumns(5);
successRatioSpinner.setToolTipText("Transmission success ratio in green area"); transmissionSpinner.setToolTipText("Transmitting range (m)");
interferenceSpinner.setToolTipText("Interference range (m)");
successRatioTxSpinner.setToolTipText("Transmission success ratio (%)");
successRatioRxSpinner.setToolTipText("Reception success ratio (%)");
transmissionSpinner.addChangeListener(new ChangeListener() { transmissionSpinner.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
@ -205,9 +222,17 @@ public class UDGM extends AbstractRadioMedium {
} }
}); });
successRatioSpinner.addChangeListener(new ChangeListener() { successRatioTxSpinner.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) { public void stateChanged(ChangeEvent e) {
SUCCESS_RATIO = ((SpinnerNumberModel) successRatioSpinner SUCCESS_RATIO_TX = ((SpinnerNumberModel) successRatioTxSpinner
.getModel()).getNumber().doubleValue();
repaint();
}
});
successRatioRxSpinner.addChangeListener(new ChangeListener() {
public void stateChanged(ChangeEvent e) {
SUCCESS_RATIO_RX = ((SpinnerNumberModel) successRatioRxSpinner
.getModel()).getNumber().doubleValue(); .getModel()).getNumber().doubleValue();
repaint(); repaint();
} }
@ -215,10 +240,12 @@ public class UDGM extends AbstractRadioMedium {
getCurrentCanvas().add(transmissionSpinner); getCurrentCanvas().add(transmissionSpinner);
getCurrentCanvas().add(interferenceSpinner); getCurrentCanvas().add(interferenceSpinner);
getCurrentCanvas().add(successRatioSpinner); getCurrentCanvas().add(successRatioTxSpinner);
getCurrentCanvas().add(successRatioRxSpinner);
transmissionSpinner.setVisible(false); transmissionSpinner.setVisible(false);
interferenceSpinner.setVisible(false); interferenceSpinner.setVisible(false);
successRatioSpinner.setVisible(false); successRatioTxSpinner.setVisible(false);
successRatioRxSpinner.setVisible(false);
// Add mouse listener for selecting motes // Add mouse listener for selecting motes
getCurrentCanvas().addMouseListener(new MouseListener() { getCurrentCanvas().addMouseListener(new MouseListener() {
@ -240,7 +267,8 @@ public class UDGM extends AbstractRadioMedium {
selectedMote = null; selectedMote = null;
transmissionSpinner.setVisible(false); transmissionSpinner.setVisible(false);
interferenceSpinner.setVisible(false); interferenceSpinner.setVisible(false);
successRatioSpinner.setVisible(false); successRatioTxSpinner.setVisible(false);
successRatioRxSpinner.setVisible(false);
repaint(); repaint();
return; return;
} }
@ -411,8 +439,8 @@ public class UDGM extends AbstractRadioMedium {
double moteInterferenceRange = INTERFERENCE_RANGE double moteInterferenceRange = INTERFERENCE_RANGE
* (0.01 * sendingRadio.getCurrentOutputPowerIndicator()); * (0.01 * sendingRadio.getCurrentOutputPowerIndicator());
// If in random state, check if transmission fails /* Fail transmission randomly (affects all receiving nodes) */
if (SUCCESS_RATIO < 1.0 && random.nextDouble() > SUCCESS_RATIO) { if (SUCCESS_RATIO_TX < 1.0 && random.nextDouble() > SUCCESS_RATIO_TX) {
return newConnection; return newConnection;
} }
@ -437,7 +465,8 @@ public class UDGM extends AbstractRadioMedium {
// Keep interfering radio // Keep interfering radio
newConnection.addInterfered(listeningRadio); newConnection.addInterfered(listeningRadio);
} else if (listeningRadio.isReceiving()) { } else if (listeningRadio.isReceiving() ||
(SUCCESS_RATIO_RX < 1.0 && random.nextDouble() > SUCCESS_RATIO_RX)) {
newConnection.addInterfered(listeningRadio); newConnection.addInterfered(listeningRadio);
// Start interfering radio // Start interfering radio
@ -539,8 +568,14 @@ 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("success_ratio"); /* Transmission success probability */
element.setText("" + SUCCESS_RATIO); element = new Element("success_ratio_tx");
element.setText("" + SUCCESS_RATIO_TX);
config.add(element);
/* Reception success probability */
element = new Element("success_ratio_rx");
element.setText("" + SUCCESS_RATIO_RX);
config.add(element); config.add(element);
return config; return config;
@ -557,8 +592,18 @@ public class UDGM extends AbstractRadioMedium {
INTERFERENCE_RANGE = Double.parseDouble(element.getText()); INTERFERENCE_RANGE = Double.parseDouble(element.getText());
} }
/* Backwards compatibility */
if (element.getName().equals("success_ratio")) { if (element.getName().equals("success_ratio")) {
SUCCESS_RATIO = Double.parseDouble(element.getText()); SUCCESS_RATIO_TX = Double.parseDouble(element.getText());
logger.warn("Loading old COOJA Config, XML element \"sucess_ratio\" parsed at \"sucess_ratio_tx\"");
}
if (element.getName().equals("success_ratio_tx")) {
SUCCESS_RATIO_TX = Double.parseDouble(element.getText());
}
if (element.getName().equals("success_ratio_rx")) {
SUCCESS_RATIO_RX = Double.parseDouble(element.getText());
} }
} }
random.setSeed(mySimulation.getRandomSeed()); random.setSeed(mySimulation.getRandomSeed());