X-Git-Url: http://nitlanguage.org diff --git a/tests/bench_netsim.nit b/tests/bench_netsim.nit index ca5debe..6531814 100644 --- a/tests/bench_netsim.nit +++ b/tests/bench_netsim.nit @@ -19,7 +19,7 @@ class Node do return _name end - var _name: String = "noname" + var name: String = "noname" end class WakeUpNode @@ -31,12 +31,12 @@ class WakeUpNode do _scheduler.add_event(self, d) end - var _scheduler: Scheduler + var scheduler: Scheduler is noinit end class NodeSource super Node - var _nexts: nullable ArraySet[NodeSink] = null + var nexts: nullable ArraySet[NodeSink] = null fun attach(n: NodeSink) # Add the sink `n' the the connected nodes # Do nothing if `n' is already connected @@ -76,8 +76,8 @@ end # class Scheduler - var _time_list: Array[Couple[Int, WakeUpNode]] = new Array[Couple[Int, WakeUpNode]] - var _time: Int = 0 # What time is it ? + var time_list: Array[Couple[Int, WakeUpNode]] = new Array[Couple[Int, WakeUpNode]] + var time: Int = 0 # What time is it ? fun add_event(n: WakeUpNode, d: Int) # The node `n' whant to be weaked up in `d' time units do @@ -136,7 +136,7 @@ class BeepSource send wake_up_in(_delay) end - var _delay: Int + var delay: Int fun start do wake_up_in(_delay) @@ -171,7 +171,7 @@ end class NodeAlternate super NodeSink super NodeSource - var _last: nullable NodeSource + var last: nullable NodeSource redef fun recieve(n: NodeSource) do if n != _last then @@ -189,7 +189,7 @@ end class NodeEat super CountSink super NodeSource - var _limit: Int + var limit: Int redef fun recieve(n: NodeSource) do var c = count + 1 @@ -212,7 +212,7 @@ class NodeDelay super NodeSource super NodeSink super WakeUpNode - var _delay: Int + var delay: Int redef fun recieve(n: NodeSource) do wake_up_in(_delay) @@ -267,11 +267,11 @@ e1.attach(a1) b1.start b2.start -var nb = 100000 +var nb = 10 if not args.is_empty then nb = args.first.to_i end -s.run_for(nb) +s.run_for(1 << nb) print(c1.count)