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

bugfix: generated random seeds were not reloaded correctly

Browse source
This commit is contained in:
fros4943 2010-01-15 14:00:06 +00:00
parent c557f23bf4
commit f371965755
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
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.56 2009/11/27 15:53:10 fros4943 Exp $ * $Id: Simulation.java,v 1.57 2010/01/15 14:00:06 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -528,14 +528,19 @@ public class Simulation extends Observable implements Runnable {
// Random seed // Random seed
if (element.getName().equals("randomseed")) { if (element.getName().equals("randomseed")) {
if (manualRandomSeed != null) { long newSeed;
setRandomSeed(manualRandomSeed);
} else if (element.getText().equals("generated")) { if (element.getText().equals("generated")) {
randomSeedGenerated = true; randomSeedGenerated = true;
setRandomSeed(new Random().nextLong()); newSeed = new Random().nextLong();
} else { } else {
setRandomSeed(Long.parseLong(element.getText())); newSeed = Long.parseLong(element.getText());
} }
if (manualRandomSeed != null) {
newSeed = manualRandomSeed;
}
setRandomSeed(newSeed);
} }
// Max mote startup delay // Max mote startup delay