X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=examples%2Fccn_emu_live%2Fdce.py;h=79507b5d468c0c5a0c3cfcdbc84c5d6bbea61f14;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=dcbdf9785136b709851b907c98fe83ae49fac9f7;hpb=741b99fe027fe6b54846a0703d26510d9b40a135;p=nepi.git
diff --git a/examples/ccn_emu_live/dce.py b/examples/ccn_emu_live/dce.py
index dcbdf978..79507b5d 100644
--- a/examples/ccn_emu_live/dce.py
+++ b/examples/ccn_emu_live/dce.py
@@ -1,13 +1,11 @@
#!/usr/bin/env python
-
-###############################################################################
#
# NEPI, a framework to manage network experiments
+# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,8 +16,8 @@
# along with this program. If not, see .
#
# Author: Alina Quereilhac
-#
-###############################################################################
+
+from __future__ import print_function
from nepi.execution.ec import ExperimentController
from nepi.execution.runner import ExperimentRunner
@@ -173,7 +171,7 @@ def avg_interests(ec, run):
f = open("/tmp/metric", "a+")
f.write("%.2f\n" % metric)
f.close()
- print " METRIC", metric
+ print(" METRIC", metric)
return metric
@@ -215,7 +213,7 @@ if __name__ == '__main__':
add_node_callback = add_dce_node,
add_edge_callback = add_dce_edge)
- print "Results stored at", ec.exp_dir
+ print("Results stored at", ec.exp_dir)
#### Retrieve the consumer to wait for ot to finish
ccncat = ec.filter_resources("linux::ns3::dce::CCNCat")