From 77eb4ec65ac371e83d4dbe34efbafb84a1295453 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 2 Jul 2007 15:08:10 +0200
Subject: [PATCH] improve sample code, make it build

---
 SConstruct                  |  6 ++++++
 samples/main-random-walk.cc | 29 ++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 320bd5c3f..d77098af2 100644
--- a/SConstruct
+++ b/SConstruct
@@ -413,6 +413,12 @@ ns3.add(sample_callback)
 sample_callback.add_dep('core')
 sample_callback.add_source('main-callback.cc')
 
+sample_random_walk = build.Ns3Module('sample-random-walk', 'samples')
+sample_random_walk.set_executable()
+ns3.add(sample_random_walk)
+sample_random_walk.add_deps(['core', 'node'])
+sample_random_walk.add_source('main-random-walk.cc')
+
 sample_ptr = build.Ns3Module('sample-ptr', 'samples')
 sample_ptr.set_executable()
 ns3.add(sample_ptr)
diff --git a/samples/main-random-walk.cc b/samples/main-random-walk.cc
index 2ca10fa5a..59ade2f0a 100644
--- a/samples/main-random-walk.cc
+++ b/samples/main-random-walk.cc
@@ -1,5 +1,23 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 
+#include "ns3/ptr.h"
+#include "ns3/position.h"
+#include "ns3/position-set-notifier.h"
+#include "ns3/random-walk-position.h"
+#include "ns3/default-value.h"
+#include "ns3/command-line.h"
+#include "ns3/simulator.h"
+#include "ns3/nstime.h"
+
+using namespace ns3;
+
+static void 
+CourseChange (Ptr<const Position> position)
+{
+  double x, y, z;
+  position->Get (x, y, z);
+  std::cout << "pos=" << position << ", x=" << x << ", y=" << y << ", z=" << z << std::endl;
+}
 
 int main (int argc, char *argv[])
 {
@@ -9,7 +27,16 @@ int main (int argc, char *argv[])
   Bind ("RandomWalkModeDistance", "20");
   Bind ("RandomWalkModeTime", "2s");
 
-  RandomWalkPosition pos;
+  CommandLine::Parse (argc, argv);
+
+  Ptr<PositionSetNotifier> notifier = Create<PositionSetNotifier> ();
+  Ptr<RandomWalkPosition> position = Create<RandomWalkPosition> ();
+  position->AddInterface (notifier);
+  notifier->RegisterListener (MakeCallback (&CourseChange));
+
+  Simulator::StopAt (Seconds (10.0));
+
+  Simulator::Run ();
   
   return 0;
 }