roboptim-commit Mailing List for RobOptim (Page 96)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "roboptim".

The branch, core has been updated
       via  0793bf10a57fc949e0d614daf985db2bf18ba7bd (commit)
      from  36cee3b8d16c882203774e6333a6b6fed53b3ba8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0793bf10a57fc949e0d614daf985db2bf18ba7bd
Author: Thomas Moulard <tho...@gm...>
Date:   Fri Jun 26 19:01:31 2009 +0900

    Add method to allow safe iteration on a discrete interval.
    
    	* include/roboptim/core/function.hh: Implement foreach.
    	* tests/simple.cc: Test foreach.
    	* tests/simple.stdout: Regenerate.
    
    Signed-off-by: Thomas Moulard <tho...@gm...>

diff --git a/ChangeLog b/ChangeLog
index 896aaa1..f560217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2009-06-26  Thomas Moulard  <tho...@gm...>
 
+	Add method to allow safe iteration on a discrete interval.
+	* include/roboptim/core/function.hh: Implement foreach.
+	* tests/simple.cc: Test foreach.
+	* tests/simple.stdout: Regenerate.
+
+2009-06-26  Thomas Moulard  <tho...@gm...>
+
 	Add optional function name.
 	* include/roboptim/core/derivable-function.hh,
 	* include/roboptim/core/function.hh,
diff --git a/include/roboptim/core/function.hh b/include/roboptim/core/function.hh
index 7f3ef7e..5075c13 100644
--- a/include/roboptim/core/function.hh
+++ b/include/roboptim/core/function.hh
@@ -208,6 +208,35 @@ namespace roboptim
       return boost::get<2> (interval);
     }
 
+    /// \brief Iterate on an interval
+    ///
+    /// Call the functor to each discretization point of the discrete
+    /// interval.
+    /// \param interval iterval on which the method iterates
+    /// \param functor unary function that will be applied
+    /// \tparam F functor type (has to satisfy the STL unary function concept)
+    template <typename F>
+    static void foreach (const discreteInterval_t interval,
+			 F functor)
+    {
+      const value_type delta =
+	getUpperBound (interval) - getLowerBound (interval);
+      assert (delta >= 0.);
+
+      value_type n = floor (delta / getStep (interval));
+
+      for (size_type i = 0; i <= n; ++i)
+	{
+	  const value_type t =
+	    getLowerBound (interval) + i * getStep (interval);
+	  std::cout << i << std::endl;
+	  std::cout << t << std::endl;
+	  assert (getLowerBound (interval) <= t
+		  && t <= getUpperBound (interval));
+	  functor (t);
+	}
+    }
+
     /// \}
 
     /// \brief Check the given result size is valid.
diff --git a/tests/simple.cc b/tests/simple.cc
index f5b785e..aa1e313 100644
--- a/tests/simple.cc
+++ b/tests/simple.cc
@@ -41,6 +41,27 @@ struct F : public Function
   // No gradient, hessian.
 };
 
+
+struct CountUnaryFunction
+{
+  typedef void Result;
+
+  CountUnaryFunction (int& cnt)
+    : cnt_ (cnt)
+  {}
+
+  void operator () (double x)
+  {
+    std::cout << "Discrete point: " << x
+	      << " (cnt: " << ++cnt_ << ")"
+	      << std::endl;
+  }
+
+private:
+  int& cnt_;
+};
+
+
 int run_test ()
 {
   // Instantiate the function and the problem.
@@ -98,6 +119,36 @@ int run_test ()
   std::cout << gs->getMinimum<SolverError> ().what ()
             << std::endl;
 
+
+  // Check iteration in discrete intervals.
+  {
+    int cnt = 0;
+    CountUnaryFunction count (cnt);
+
+    {
+      Function::discreteInterval_t interval (2.3, 3., 0.5);
+      Function::foreach (interval, count);
+      assert (cnt == 2);
+      std::cout << std::endl;
+    }
+
+    {
+      cnt = 0;
+      Function::discreteInterval_t interval (2., 3., 0.1);
+      Function::foreach (interval, count);
+      assert (cnt == 11);
+      std::cout << std::endl;
+    }
+
+    {
+      cnt = 0;
+      Function::discreteInterval_t interval (0.8, 10.8, 1.);
+      Function::foreach (interval, count);
+      assert (cnt == 11);
+      std::cout << std::endl;
+    }
+  }
+
   return 0;
 }
 
diff --git a/tests/simple.stdout b/tests/simple.stdout
index 8366691..a881daf 100644
--- a/tests/simple.stdout
+++ b/tests/simple.stdout
@@ -28,3 +28,78 @@ Problem:
   Starting value: [1](0)
   Infinity value (for all functions): inf
 The dummy solver always fail.
+0
+2.3
+Discrete point: 2.3 (cnt: 1)
+1
+2.8
+Discrete point: 2.8 (cnt: 2)
+
+0
+2
+Discrete point: 2 (cnt: 1)
+1
+2.1
+Discrete point: 2.1 (cnt: 2)
+2
+2.2
+Discrete point: 2.2 (cnt: 3)
+3
+2.3
+Discrete point: 2.3 (cnt: 4)
+4
+2.4
+Discrete point: 2.4 (cnt: 5)
+5
+2.5
+Discrete point: 2.5 (cnt: 6)
+6
+2.6
+Discrete point: 2.6 (cnt: 7)
+7
+2.7
+Discrete point: 2.7 (cnt: 8)
+8
+2.8
+Discrete point: 2.8 (cnt: 9)
+9
+2.9
+Discrete point: 2.9 (cnt: 10)
+10
+3
+Discrete point: 3 (cnt: 11)
+
+0
+0.8
+Discrete point: 0.8 (cnt: 1)
+1
+1.8
+Discrete point: 1.8 (cnt: 2)
+2
+2.8
+Discrete point: 2.8 (cnt: 3)
+3
+3.8
+Discrete point: 3.8 (cnt: 4)
+4
+4.8
+Discrete point: 4.8 (cnt: 5)
+5
+5.8
+Discrete point: 5.8 (cnt: 6)
+6
+6.8
+Discrete point: 6.8 (cnt: 7)
+7
+7.8
+Discrete point: 7.8 (cnt: 8)
+8
+8.8
+Discrete point: 8.8 (cnt: 9)
+9
+9.8
+Discrete point: 9.8 (cnt: 10)
+10
+10.8
+Discrete point: 10.8 (cnt: 11)
+

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |    7 +++
 include/roboptim/core/function.hh |   29 ++++++++++++++
 tests/simple.cc                   |   51 +++++++++++++++++++++++++
 tests/simple.stdout               |   75 +++++++++++++++++++++++++++++++++++++
 4 files changed, 162 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
roboptim




2009	Jan	Feb	Mar	Apr	May	Jun (62)	Jul (62)	Aug (36)	Sep (24)	Oct (41)	Nov (182)	Dec (8)
2010	Jan (12)	Feb (13)	Mar (104)	Apr (95)	May (90)	Jun (90)	Jul (93)	Aug (97)	Sep (91)	Oct (93)	Nov (90)	Dec (95)
2011	Jan (96)	Feb (84)	Mar (94)	Apr (91)	May (93)	Jun (91)	Jul (93)	Aug (93)	Sep (107)	Oct (93)	Nov (58)	Dec
2012	Jan (8)	Feb (4)	Mar	Apr (3)	May	Jun	Jul	Aug	Sep	Oct (1)	Nov (6)	Dec (5)
2013	Jan (16)	Feb (22)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

roboptim-commit Mailing List for RobOptim (Page 96)

roboptim-commit — Commit mailing-list (high volume)