Added noise model.

diff --git a/apps/tests/TestNetwork/meyer-short.txt b/apps/tests/TestNetwork/meyer-short.txt
new file mode 100644 (file)
index 0000000..556ac0f
--- /dev/null
+++ b/apps/tests/TestNetwork/meyer-short.txt
@@ -0,0 +1,1000 @@
+-41
+-41
+-41
+-41
+-41
+-41
+-41
+-91
+-41
+-41
+-41
+-41
+-41
+-48
+-41
+-41
+-41
+-83
+-98
+-80
+-80
+-79
+-79
+-79
+-79
+-98
+-79
+-80
+-79
+-80
+-80
+-80
+-83
+-83
+-83
+-83
+-82
+-82
+-41
+-82
+-82
+-82
+-82
+-82
+-82
+-41
+-94
+-93
+-93
+-87
+-89
+-90
+-45
+-92
+-85
+-98
+-80
+-80
+-79
+-78
+-79
+-79
+-79
+-97
+-94
+-83
+-81
+-80
+-82
+-81
+-81
+-84
+-84
+-86
+-98
+-89
+-79
+-79
+-79
+-79
+-79
+-79
+-57
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-41
+-84
+-96
+-97
+-79
+-90
+-98
+-79
+-79
+-79
+-79
+-79
+-79
+-92
+-83
+-83
+-82
+-81
+-83
+-80
+-85
+-82
+-81
+-82
+-82
+-82
+-82
+-41
+-82
+-82
+-82
+-82
+-82
+-82
+-83
+-82
+-82
+-82
+-82
+-82
+-98
+-98
+-79
+-79
+-79
+-79
+-79
+-78
+-97
+-91
+-96
+-91
+-82
+-82
+-82
+-82
+-82
+-82
+-77
+-82
+-82
+-82
+-82
+-82
+-82
+-98
+-79
+-79
+-79
+-79
+-79
+-79
+-94
+-98
+-96
+-81
+-82
+-82
+-82
+-82
+-82
+-91
+-91
+-93
+-91
+-91
+-91
+-91
+-93
+-91
+-91
+-91
+-91
+-91
+-92
+-91
+-91
+-87
+-84
+-79
+-79
+-79
+-79
+-79
+-78
+-94
+-79
+-79
+-79
+-79
+-80
+-79
+-94
+-98
+-82
+-83
+-82
+-82
+-83
+-83
+-82
+-41
+-81
+-98
+-98
+-98
+-86
+-82
+-99
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-81
+-82
+-82
+-90
+-79
+-79
+-79
+-78
+-78
+-79
+-79
+-79
+-78
+-79
+-79
+-79
+-98
+-82
+-81
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-81
+-81
+-81
+-90
+-82
+-81
+-82
+-82
+-81
+-81
+-82
+-82
+-82
+-80
+-82
+-81
+-81
+-81
+-42
+-61
+-96
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-98
+-98
+-98
+-98
+-98
+-41
+-41
+-98
+-99
+-84
+-98
+-41
+-98
+-98
+-98
+-85
+-98
+-96
+-96
+-91
+-87
+-98
+-96
+-99
+-98
+-90
+-88
+-86
+-88
+-96
+-91
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-84
+-93
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-80
+-80
+-80
+-79
+-80
+-80
+-80
+-80
+-79
+-79
+-80
+-80
+-73
+-80
+-80
+-80
+-79
+-78
+-80
+-80
+-80
+-80
+-80
+-79
+-80
+-74
+-40
+-40
+-91
+-40
+-40
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-91
+-91
+-90
+-97
+-40
+-40
+-91
+-91
+-40
+-40
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-82
+-83
+-82
+-96
+-79
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-79
+-80
+-80
+-80
+-41
+-40
+-40
+-40
+-98
+-80
+-79
+-79
+-79
+-79
+-80
+-80
+-80
+-80
+-79
+-80
+-79
+-40
+-40
+-40
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-79
+-80
+-80
+-80
+-79
+-92
+-83
+-82
+-83
+-82
+-82
+-82
+-83
+-82
+-81
+-82
+-82
+-82
+-90
+-92
+-82
+-82
+-83
+-83
+-83
+-83
+-83
+-82
+-82
+-83
+-83
+-82
+-42
+-40
+-40
+-70
+-82
+-68
+-80
+-79
+-80
+-79
+-80
+-78
+-80
+-80
+-80
+-96
+-80
+-79
+-80
+-80
+-80
+-80
+-79
+-80
+-80
+-80
+-80
+-80
+-60
+-79
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-79
+-80
+-80
+-99
+-80
+-80
+-80
+-80
+-80
+-79
+-80
+-80
+-80
+-79
+-80
+-80
+-99
+-84
+-83
+-83
+-83
+-84
+-83
+-83
+-83
+-84
+-84
+-84
+-84
+-84
+-48
+-79
+-80
+-80
+-80
+-80
+-79
+-80
+-79
+-80
+-80
+-79
+-80
+-91
+-91
+-91
+-92
+-91
+-92
+-94
+-79
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-98
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-58
+-99
+-98
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-83
+-98
+-80
+-92
+-92
+-87
+-98
+-98
+-86
+-98
+-98
+-95
+-98
+-97
+-99
+-97
+-41
+-72
+-87
+-84
+-84
+-83
+-82
+-84
+-78
+-78
+-79
+-79
+-79
+-83
+-85
+-94
+-83
+-86
+-87
+-96
+-84
+-86
+-88
+-98
+-96
+-95
+-85
+-90
+-98
+-98
+-98
+-80
+-80
+-95
+-98
+-98
+-96
+-98
+-98
+-80
+-99
+-96
+-80
+-98
+-96
+-94
+-98
+-96
+-99
+-80
+-80
+-80
+-80
+-80
+-45
+-80
+-91
+-80
+-80
+-80
+-82
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-41
+-40
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-91
+-40
+-97
+-84
+-84
+-84
+-84
+-84
+-84
+-84
+-85
+-84
+-81
+-84
+-85
+-97
+-85
+-85
+-86
+-85
+-85
+-82
+-85
+-85
+-85
+-85
+-85
+-85
+-87
+-86
+-85
+-86
+-86
+-85
+-84
+-86
+-84
+-85
+-86
+-86
+-70
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-86
+-41
+-94
+-41
+-40
+-97
+-80
+-40
+-91
+-98
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-93
+-40
+-93
+-93
+-40
+-40
+-93
+-93
+-98
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-81
+-80
+-80
+-80
+-80
+-80
+-80
+-79
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-98
+-40
+-40
+-93
+-85
+-85
+-82
+-82
+-83
+-86
+-85
+-86
+-84
+-85
+-82
+-83
+-84
+-85
+-40
+-40
+-78
+-40
+-98
+-98
+-98
+-99
+-41
+-80
+-80
+-78
+-81
+-79
+-81
+-81
+-79
+-81
+-81
+-81
+-81
+-96
+-98
+-80
+-93
+-80
+-96
+-98
+-98
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-81
+-81
+-80
+-80
+-80
+-98
+-80
+-80
+-81
+-80
+-80
+-80
+-80
+-80
+-80
+-81
+-80
+-80
+-99
+-90
+-84
+-82
+-86
+-85
+-85
+-85
+-85
+-86
+-86
+-85
+-86
+-86
+-98
+-96
+-96
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-79
+-81
+-80
+-48
+-90
+-89
+-79
+-93
+-91
+-95
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-98
+-95
+-98
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-41
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-80
+-96
+-98
+-98
+-99
+-71
+-98
+-98
+-99
+-98
+-98
+-98
+-98
+-98 
+
+

diff --git a/apps/tests/TestNetwork/test.py b/apps/tests/TestNetwork/test.py
index cabe01baf625a93eb37d944f0a66601d135a50cc..616a8630c21c789ab986d2abd387ee2b1647a606 100644 (file)
--- a/apps/tests/TestNetwork/test.py
+++ b/apps/tests/TestNetwork/test.py
@@ -15,11 +15,22 @@ for line in lines:
   if (len(s) > 0):
     if s[0] == "gain":
       r.add(int(s[1]), int(s[2]), float(s[3]))
-    elif s[0] == "noise":
-      r.setNoise(int(s[1]), float(s[2]), float(s[3]))
+
+noise = open("meyer-short.txt", "r")
+lines = noise.readlines()
+for line in lines:
+  str = line.strip()
+  if (str != ""):
+    val = int(str)
+    for i in range(0, 10):
+      m = t.getNode(i);
+      m.addNoiseTraceReading(val)
+
+
 
 for i in range(0, 10):
   m = t.getNode(i);
+  m.createNoiseModel();
   time = randint(t.ticksPerSecond(), 10 * t.ticksPerSecond())
   m.bootAtTime(time)
   print "Booting ", i, " at time ", time