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

added delayed startups random for contiki motes

Browse source
This commit is contained in:
fros4943 2007-06-19 09:58:43 +00:00
parent 4596f00eb1
commit ef1588cd83
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/cooja/java/se/sics/cooja/Simulation.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: Simulation.java,v 1.12 2007/05/29 07:27:10 fros4943 Exp $ * $Id: Simulation.java,v 1.13 2007/06/19 09:58:43 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -33,6 +33,8 @@ import java.util.*;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jdom.*; import org.jdom.*;
import se.sics.cooja.contikimote.ContikiMote;
import se.sics.cooja.contikimote.interfaces.ContikiClock;
import se.sics.cooja.dialogs.*; import se.sics.cooja.dialogs.*;
/** /**
@ -76,14 +78,18 @@ public class Simulation extends Observable implements Runnable {
private GUI myGUI = null; private GUI myGUI = null;
private long tickListRandomSeed = 123456; private long randomSeed = 123456;
private int currentTickListIndex = 0; private int currentTickListIndex = 0;
private int nrTickLists = 3; private int nrTickLists = 10;
private int maxDelayedStartupTime = 10000;
private Random tickListRandom = new Random(); private Random tickListRandom = new Random();
private Random delayMotesRandom = new Random();
// Tick observable // Tick observable
private class TickObservable extends Observable { private class TickObservable extends Observable {
private void allTicksPerformed() { private void allTicksPerformed() {
@ -136,7 +142,7 @@ public class Simulation extends Observable implements Runnable {
} }
// Distribute motes according to seed // Distribute motes according to seed
tickListRandom.setSeed(tickListRandomSeed); tickListRandom.setSeed(randomSeed);
Vector<Mote> motesClone = (Vector<Mote>) motes.clone(); Vector<Mote> motesClone = (Vector<Mote>) motes.clone();
for (int i=0; i < allLists.length; i++) { for (int i=0; i < allLists.length; i++) {
for (int j=0; j < allLists[i].length; j++) { for (int j=0; j < allLists[i].length; j++) {
@ -210,6 +216,7 @@ public class Simulation extends Observable implements Runnable {
*/ */
public Simulation(GUI gui) { public Simulation(GUI gui) {
myGUI = gui; myGUI = gui;
delayMotesRandom.setSeed(randomSeed);
} }
/** /**
@ -485,6 +492,11 @@ public class Simulation extends Observable implements Runnable {
} else } else
motes.add(mote); motes.add(mote);
tickListRandom.setSeed(randomSeed);
if (maxDelayedStartupTime > 0 && mote instanceof ContikiMote) {
((ContikiClock) mote.getInterfaces().getClock()).setDrift(-delayMotesRandom.nextInt(maxDelayedStartupTime));
}
currentRadioMedium.registerMote(mote, this); currentRadioMedium.registerMote(mote, this);
this.setChanged(); this.setChanged();
this.notifyObservers(this); this.notifyObservers(this);