Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r53773 - in sandbox/itl/libs/itl: build/win32 doc example/boost_party example/man_power example/overlap_counter example/partys_height_average example/partys_tallest_guests example/user_groups test test/test_casual test/test_interval_map test/test_interval_map_mixed test/test_interval_set_infix test/test_interval_set_mixed test/test_itl_map test/test_partial_interval_quantifier test/test_separate_interval_set test/test_separate_interval_set_infix test/test_set_inerval_set test/test_set_itl_set test/test_split_interval_map test/test_split_interval_set test/test_split_interval_set_infix test/test_total_interval_quantifier
From: afojgo_at_[hidden]
Date: 2009-06-09 09:12:26


Author: jofaber
Date: 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
New Revision: 53773
URL: http://svn.boost.org/trac/boost/changeset/53773

Log:
Documentation, examples, tests: Corrections and completions. Tests passed {msvc-9.0}
Text files modified:
   sandbox/itl/libs/itl/build/win32/vc9_all.sln | 18 +++++++
   sandbox/itl/libs/itl/doc/examples.qbk | 97 ++++++++++++++++++++++++++++++++++++---
   sandbox/itl/libs/itl/doc/introduction.qbk | 11 ++--
   sandbox/itl/libs/itl/example/boost_party/boost_party.cpp | 7 +-
   sandbox/itl/libs/itl/example/man_power/man_power.cpp | 2
   sandbox/itl/libs/itl/example/overlap_counter/overlap_counter.cpp | 19 ++++---
   sandbox/itl/libs/itl/example/partys_height_average/partys_height_average.cpp | 25 ++++------
   sandbox/itl/libs/itl/example/partys_tallest_guests/partys_tallest_guests.cpp | 32 +++++-------
   sandbox/itl/libs/itl/example/user_groups/user_groups.cpp | 9 ++-
   sandbox/itl/libs/itl/test/Jamfile.v2 | 3 +
   sandbox/itl/libs/itl/test/test_casual/test_casual.cpp | 2
   sandbox/itl/libs/itl/test/test_interval_map/test_interval_map.cpp | 2
   sandbox/itl/libs/itl/test/test_interval_map_cases.hpp | 21 --------
   sandbox/itl/libs/itl/test/test_interval_map_mixed/test_interval_map_mixed.cpp | 2
   sandbox/itl/libs/itl/test/test_interval_set_infix/test_interval_set_infix.cpp | 2
   sandbox/itl/libs/itl/test/test_interval_set_mixed/test_interval_set_mixed.cpp | 2
   sandbox/itl/libs/itl/test/test_itl_map/test_itl_map.cpp | 2
   sandbox/itl/libs/itl/test/test_partial_interval_quantifier/test_partial_interval_quantifier.cpp | 2
   sandbox/itl/libs/itl/test/test_separate_interval_set/test_separate_interval_set.cpp | 2
   sandbox/itl/libs/itl/test/test_separate_interval_set_infix/test_separate_interval_set_infix.cpp | 2
   sandbox/itl/libs/itl/test/test_set_inerval_set/test_set_interval_set.cpp | 2
   sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set.cpp | 2
   sandbox/itl/libs/itl/test/test_split_interval_map/test_split_interval_map.cpp | 2
   sandbox/itl/libs/itl/test/test_split_interval_set/test_split_interval_set.cpp | 2
   sandbox/itl/libs/itl/test/test_split_interval_set_infix/test_split_interval_set_infix.cpp | 2
   sandbox/itl/libs/itl/test/test_total_interval_quantifier/test_total_interval_quantifier.cpp | 2
   26 files changed, 174 insertions(+), 100 deletions(-)

Modified: sandbox/itl/libs/itl/build/win32/vc9_all.sln
==============================================================================
--- sandbox/itl/libs/itl/build/win32/vc9_all.sln (original)
+++ sandbox/itl/libs/itl/build/win32/vc9_all.sln 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -83,6 +83,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_partys_height_average", "..\..\example\partys_height_average\vc9_partys_height_average.vcproj", "{0D1DB87E-E72A-4FE9-A067-1907CC6633F8}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_test_interval_map_infix", "..\..\test\test_interval_map_infix\vc9_test_interval_map_infix.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B7D3A9F9D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_test_split_interval_map_infix", "..\..\test\test_split_interval_map_infix\vc9_test_split_interval_map_infix.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B7D4A9F9D}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vc9_test_interval_map_infix_mixed", "..\..\test\test_interval_map_infix_mixed\vc9_test_interval_map_infix_mixed.vcproj", "{EE61B7EF-EC45-4165-8B49-FD5B8D5A9F9F}"
+EndProject
 Global
         GlobalSection(SolutionConfigurationPlatforms) = preSolution
                 Debug|Win32 = Debug|Win32
@@ -253,6 +259,18 @@
                 {0D1DB87E-E72A-4FE9-A067-1907CC6633F8}.Debug|Win32.Build.0 = Debug|Win32
                 {0D1DB87E-E72A-4FE9-A067-1907CC6633F8}.Release|Win32.ActiveCfg = Release|Win32
                 {0D1DB87E-E72A-4FE9-A067-1907CC6633F8}.Release|Win32.Build.0 = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D3A9F9D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D3A9F9D}.Debug|Win32.Build.0 = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D3A9F9D}.Release|Win32.ActiveCfg = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D3A9F9D}.Release|Win32.Build.0 = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D4A9F9D}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D4A9F9D}.Debug|Win32.Build.0 = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D4A9F9D}.Release|Win32.ActiveCfg = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B7D4A9F9D}.Release|Win32.Build.0 = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D5A9F9F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D5A9F9F}.Debug|Win32.Build.0 = Debug|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D5A9F9F}.Release|Win32.ActiveCfg = Release|Win32
+ {EE61B7EF-EC45-4165-8B49-FD5B8D5A9F9F}.Release|Win32.Build.0 = Release|Win32
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
                 HideSolutionNode = FALSE

Modified: sandbox/itl/libs/itl/doc/examples.qbk
==============================================================================
--- sandbox/itl/libs/itl/doc/examples.qbk (original)
+++ sandbox/itl/libs/itl/doc/examples.qbk 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -12,7 +12,7 @@
 
 [table Overview over Itl Examples
         [[level] [example] [classes] [features]]
- [[flagship][[link boost_itl.examples.party Party]]
+ [[intro][[link boost_itl.examples.party Party]]
                 [__itv_map__][Generates an attendance history of a party
                           by inserting into an __itv_map__.
                                           Demonstrating
@@ -22,9 +22,19 @@
                        Closed and open interval borders]]
         [[basic] [[link boost_itl.examples.interval_container Interval container]]
                 [__itv_set__,\n__sep_itv_set__,\n__spl_itv_set__,\n__spl_itv_map__]
- [basic charactersistics of interval container]]
- [[basic] [[link boost_itl.examples.overlap_counter overlap counter]][__itv_map__][The most simple application of an interval map: Counting
- the overlaps of added intervals.]]
+ [basic characteristics of interval container]]
+ [[basic] [[link boost_itl.examples.overlap_counter Overlap counter]]
+ [__itv_map__][The most simple application of an interval map:
+ Counting the overlaps of added intervals.]]
+ [[advanced][[link boost_itl.examples.partys_height_average Party's height average]]
+ [__itv_map__][Using aggregate on overlap the average of party guests is computed.
+ Associated values are user defined class objects, that implement
+ an appropriate `operator +=` for the aggregation.]]
+ [[advanced][[link boost_itl.examples.partys_tallest_guests Party's tallest guests]]
+ [__itv_map__,\n__spl_itv_map__]
+ [Using aggregate on overlap the height of the party's tallest guests is computed.
+ Associated values are aggregated via a maximum functor, that can
+ be chosen as template parameter of an interval_map class template.]]
         [[advanced][[link boost_itl.examples.month_and_week_grid Timegrids for months and weeks]]
                                     [__spl_itv_set__]
                                                                              [Shows how the ['*border preserving*]
@@ -34,7 +44,7 @@
                 [__itv_set__,\n__itv_map__]
                 [Set style operations on __itv_sets__ and __itv_maps__ like union, difference
              and intersection can be used to obtain calculations in a flexible way. Example
- [*man_power] demontrates such operations in the process of calculating the
+ [*man_power] demonstrates such operations in the process of calculating the
              available man-power of a company in a given time interval.]]
         [[advanced][[link boost_itl.examples.user_groups User groups]][__itv_map__]
                 [Example [*user_groups] shows how interval_maps can be unified or
@@ -112,6 +122,77 @@
 [example_interval_container]
 [endsect]
 
+[section Overlap counter]
+
+Example [*overlap counter] provides the simplest application
+of an interval_map that maps intervals to integers.
+An interval_map<int,int> serves as an overlap counter
+if we only add interval value pairs that carry 1 as
+associated value.
+
+Doing so, the associated values that are accumulated in
+the interval_map are just the number of overlaps of all added
+intervals.
+
+[import ../example/overlap_counter/overlap_counter.cpp]
+[example_overlap_counter]
+[endsect]
+
+[section:partys_height_average Party's height average]
+
+In the example `partys_height_average.cpp` we compute yet another aggregation:
+The average height of guests. This is done by defining a `class counted_sum`
+that sums up heights and counts the numer of guests
+via an `operator +=`.
+
+Based on the `operator +=` we can aggregate counted sums on addition
+of interval value pairs into an interval_map.
+
+[import ../example/partys_height_average/partys_height_average.cpp]
+[example_partys_height_average]
+
+Required for `class counted_sum` is a default constructor
+`counted_sum()`and
+an `operator ==` to test equality.
+To enable additive aggregation on overlap also
+an `operator +=` is needed.
+
+Note that no `operator -=` for a subtraction of `counted_sum` values
+is defined. So you can only add to the
+`interval_map<ptime, counted_sum>`
+but not subtract from it.
+
+In many real world applications only addition is needed and user
+defined classes will work fine, if they only implement
+`operator +=`. Only if any of the `operator`s `-=` or `-`
+is called on the interval_map, the user defined class has to
+implement it's own `operator -=` to provide the subractive
+aggreagtion on overlap.
+
+[endsect]
+
+
+[section:partys_tallest_guests Party's tallest guests]
+
+Defining `operator +=` (and `-=`) is proably the most important
+method to implement arbitrary kinds of user defined aggregations.
+An alternative way to choose a desired aggregation is to
+instantiate an interval_map class template with an
+appropriate ['*aggregation functor*]. For the most common
+kinds of aggregation the [*itl]
+provides the such functors as shown in the example.
+
+Example `partys_tallest_guests.cpp` also demonstrates
+the difference between an __itv_map__
+that joins intervals for equal associated values and a
+__spl_itv_map__ that preserves all borders of inserted
+intervals.
+
+[import ../example/partys_tallest_guests/partys_tallest_guests.cpp]
+[example_partys_tallest_guests]
+
+[endsect]
+
 [section Time grids for months and weeks]
 
 A __spl_itv_set__ preserves all interval borders on insertion
@@ -139,7 +220,7 @@
 
 __Itv_sets__ and __itv_maps__ can be filled and manipulated using
 set style operations such as union `+=`, difference `-=` and
-intersection `*=`.
+intersection `&=`.
 
 In this example [*man power] a number of those operations are
 demonstrated in the process of calculation the available working
@@ -163,10 +244,10 @@
 The membership for each user in one of the user groups has a time
 interval of validity. The group membership begins and ends.
 
-* Using a union operation `+=` we can have an overview over the unified
+* Using a union operation `+` we can have an overview over the unified
   user groups and the memebership dates of employees.
 
-* Computing an intersection `*=` shows who is member of both med_users
+* Computing an intersection `&` shows who is member of both med_users
   and admin_users at what times.
 
 [import ../example/user_groups/user_groups.cpp]

Modified: sandbox/itl/libs/itl/doc/introduction.qbk
==============================================================================
--- sandbox/itl/libs/itl/doc/introduction.qbk (original)
+++ sandbox/itl/libs/itl/doc/introduction.qbk 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -20,19 +20,20 @@
 
 Interval containers of the *itl* have been developed initially at
 [@http://www.cortex-software.de/desktopdefault.aspx Cortex Software GmbH]
-to solve problems related to date interval
+to solve problems related to date and time interval
 computations in the context of a Hospital Information System.
 Time intervals with associated values like ['amount of invoice]
 or ['set of therapies] had to be maipulated in statistics,
 billing programs and therapy scheduling programs.
-So the *itl* emerged out of those industrial use cases and
-extracts a generic library that helps to solve common
-problems from the time domain more easiely.
+So the *itl* emerged out of those industrial use cases.
+It extracts generic code that helps to solve common
+problems from the date and time problem domain and can be
+beneficial in other fields as well.
 
 From those use cases, specifically the computations for
 statistics, also stems the quite useful idea of ['aggregating
 associated] values, when ['intervals overlap]. This idea is
-fundamental for the way interval_maps of the *itl* are
+fundamental for the way *itl's* interval_maps are
 designed.
 
 

Modified: sandbox/itl/libs/itl/example/boost_party/boost_party.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/boost_party/boost_party.cpp (original)
+++ sandbox/itl/libs/itl/example/boost_party/boost_party.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -83,20 +83,21 @@
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 19:30"),
           time_from_string("2008-05-20 23:00")),
- mary_harry));
+ mary_harry));
 
     party += // element addition can also be done via operator +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 20:10"),
           time_from_string("2008-05-21 00:00")),
- diana_susan);
+ diana_susan);
+
     party +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 22:15"),
           time_from_string("2008-05-21 00:30")),
- peter);
+ peter);
 
 
     interval_map<ptime, GuestSetT>::iterator it = party.begin();

Modified: sandbox/itl/libs/itl/example/man_power/man_power.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/man_power/man_power.cpp (original)
+++ sandbox/itl/libs/itl/example/man_power/man_power.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -12,7 +12,7 @@
 
     Interval sets and maps can be filled and manipulated using
     set style operation like union (+=), difference (-=) and intersection
- (*=).
+ (&=).
 
     In this example 'man_power' a number of those operations are
     demonstrated in the process of calculation the available working

Modified: sandbox/itl/libs/itl/example/overlap_counter/overlap_counter.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/overlap_counter/overlap_counter.cpp (original)
+++ sandbox/itl/libs/itl/example/overlap_counter/overlap_counter.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -8,15 +8,6 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#include <stdio.h>
-#include <iostream>
-#include <boost/itl/type_traits/to_string.hpp>
-#include <boost/itl/split_interval_map.hpp>
-
-using namespace std;
-using namespace boost::itl;
-
-
 /** Example overlap_counter.cpp \file overlap_counter.cpp
 
     The most basic application of an interval_map is a counter counting
@@ -32,6 +23,15 @@
 
     \include overlap_counter/overlap_counter.cpp
 */
+//[example_overlap_counter
+#include <stdio.h>
+#include <iostream>
+#include <boost/itl/type_traits/to_string.hpp>
+#include <boost/itl/split_interval_map.hpp>
+
+using namespace std;
+using namespace boost::itl;
+
 
 /* A interval_map<int, int> is a map<Interval<int>, int> that maps intervals
     to int values. On overlap of intervals it sums up the associated int
@@ -102,3 +102,4 @@
 // in interval [6,8): 3 intervals overlap
 // in interval [8,9): 2 intervals overlap
 // -----------------------------------------------------------
+//]

Modified: sandbox/itl/libs/itl/example/partys_height_average/partys_height_average.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/partys_height_average/partys_height_average.cpp (original)
+++ sandbox/itl/libs/itl/example/partys_height_average/partys_height_average.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -62,45 +62,40 @@
 {
     interval_map<ptime, counted_sum> height_sums;
 
- height_sums.add(
+ height_sums +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 19:30"),
           time_from_string("2008-05-20 23:00")),
- counted_sum(165)) // Mary is 1,65 m tall.
- );
+ counted_sum(165)); // Mary is 1,65 m tall.
 
- height_sums.add(
+ height_sums +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 19:30"),
           time_from_string("2008-05-20 23:00")),
- counted_sum(180)) // Harry is 1,80 m tall.
- );
+ counted_sum(180)); // Harry is 1,80 m tall.
 
- height_sums.add(
+ height_sums +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 20:10"),
           time_from_string("2008-05-21 00:00")),
- counted_sum(170)) // Diana is 1,70 m tall.
- );
+ counted_sum(170)); // Diana is 1,70 m tall.
 
- height_sums.add(
+ height_sums +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 20:10"),
           time_from_string("2008-05-21 00:00")),
- counted_sum(165)) // Susan is 1,65 m tall.
- );
+ counted_sum(165)); // Susan is 1,65 m tall.
 
- height_sums.add(
+ height_sums +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 22:15"),
           time_from_string("2008-05-21 00:30")),
- counted_sum(200)) // Peters height is 2,00 m
- );
+ counted_sum(200)); // Peters height is 2,00 m
 
     interval_map<ptime, counted_sum>::iterator height_sum_ = height_sums.begin();
     cout << "-------------- History of average guest height -------------------\n";

Modified: sandbox/itl/libs/itl/example/partys_tallest_guests/partys_tallest_guests.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/partys_tallest_guests/partys_tallest_guests.cpp (original)
+++ sandbox/itl/libs/itl/example/partys_tallest_guests/partys_tallest_guests.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -52,29 +52,26 @@
 {
     PartyHeightHistoryT tallest_guest;
 
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 19:30"),
           time_from_string("2008-05-20 23:00")),
- 180) // Mary & Harry: Harry is 1,80 m tall.
- );
+ 180); // Mary & Harry: Harry is 1,80 m tall.
 
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 20:10"),
           time_from_string("2008-05-21 00:00")),
- 170) // Diana & Susan: Diana is 1,70 m tall.
- );
+ 170); // Diana & Susan: Diana is 1,70 m tall.
 
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 22:15"),
           time_from_string("2008-05-21 00:30")),
- 200) // Peters height is 2,00 m
- );
+ 200); // Peters height is 2,00 m
 
     PartyHeightHistoryT::iterator height_ = tallest_guest.begin();
     cout << "-------------- History of maximum guest height -------------------\n";
@@ -96,34 +93,31 @@
 
     // adding an element can be done wrt. simple aggregate functions
     // like e.g. min, max etc. in their 'inplace' or op= incarnation
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 19:30"),
           time_from_string("2008-05-20 23:00")),
- 180) // Mary & Harry: Harry is 1,80 m tall.
- );
+ 180); // Mary & Harry: Harry is 1,80 m tall.
 
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 20:10"),
           time_from_string("2008-05-21 00:00")),
- 170) // Diana & Susan: Diana is 1,70 m tall.
- );
+ 170); // Diana & Susan: Diana is 1,70 m tall.
 
- tallest_guest.add(
+ tallest_guest +=
       make_pair(
         interval<ptime>::rightopen(
           time_from_string("2008-05-20 22:15"),
           time_from_string("2008-05-21 00:30")),
- 200) // Peters height is 2,00 m
- );
+ 200); // Peters height is 2,00 m
 
     PartyHeightSplitHistoryT::iterator height_ = tallest_guest.begin();
     cout << "\n";
     cout << "-------- Split History of maximum guest height -------------------\n";
- cout << "--- Same map as above but split for every interval insertion. ---\n";
+ cout << "--- Same map as above but split for every interval insertion. ---\n";
     while(height_ != tallest_guest.end())
     {
         interval<ptime> when = height_->first;

Modified: sandbox/itl/libs/itl/example/user_groups/user_groups.cpp
==============================================================================
--- sandbox/itl/libs/itl/example/user_groups/user_groups.cpp (original)
+++ sandbox/itl/libs/itl/example/user_groups/user_groups.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -16,16 +16,17 @@
     In the example there is a user group 'med_users' of a hospial staff
     that has the authorisation to handle medical data of patients.
     User group 'admin_users' has access to aministrative data like
- health inshurance and financial data.
+ health inshurance and invoice data.
 
     The membership for each user in one of the user groups has a time
     interval of validity. The group membership begins and ends.
 
- Using a union operation += we can have an overview over both
+ Using a union operation '+' we can have an overview over both
     user groups and the memebership dates of employees.
 
- Computing an intersection (*=) shows who is member of both med_users
- and admin_users at what times.
+ Computing an intersection '&' shows the super users. The persons
+ that are members of both med_users and admin_users and the times
+ of the joint memberships.
     
     \include user_groups/user_groups.cpp
 */

Modified: sandbox/itl/libs/itl/test/Jamfile.v2
==============================================================================
--- sandbox/itl/libs/itl/test/Jamfile.v2 (original)
+++ sandbox/itl/libs/itl/test/Jamfile.v2 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -33,8 +33,11 @@
       
       # maps
       [ run test_interval_map/test_interval_map.cpp ]
+ [ run test_interval_map_infix/test_interval_map_infix.cpp ]
       [ run test_split_interval_map/test_split_interval_map.cpp ]
+ [ run test_split_interval_map_infix/test_split_interval_map_infix.cpp ]
       [ run test_interval_map_mixed/test_interval_map_mixed.cpp ]
+ [ run test_interval_map_infix_mixed/test_interval_map_infix_mixed.cpp ]
       [ run test_itl_map/test_itl_map.cpp ]
 
       # handcoded tests using laws (not LaBatea) -------------------------------

Modified: sandbox/itl/libs/itl/test/test_casual/test_casual.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_casual/test_casual.cpp (original)
+++ sandbox/itl/libs/itl/test/test_casual/test_casual.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::casual unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_interval_map/test_interval_map.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map/test_interval_map.cpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map/test_interval_map.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::interval_map unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_interval_map_cases.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_cases.hpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map_cases.hpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -53,27 +53,6 @@
 BOOST_AUTO_TEST_CASE_TEMPLATE
 (test_itl_interval_map_flip_4_bicremental_types, T, bicremental_types)
 { interval_map_flip_4_bicremental_types<INTERVAL_MAP, T, int>();}
-/*
-BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_interval_map_infix_plus_overload_4_bicremental_types, T, bicremental_types)
-{ interval_map_infix_plus_overload_4_bicremental_types<INTERVAL_MAP, T, int>();}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_interval_map_infix_pipe_overload_4_bicremental_types, T, bicremental_types)
-{ interval_map_infix_pipe_overload_4_bicremental_types<INTERVAL_MAP, T, int>();}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_interval_map_infix_minus_overload_4_bicremental_types, T, bicremental_types)
-{ interval_map_infix_minus_overload_4_bicremental_types<INTERVAL_MAP, T, int>();}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_interval_map_infix_et_overload_4_bicremental_types, T, bicremental_types)
-{ interval_map_infix_et_overload_4_bicremental_types<INTERVAL_MAP, T, int>();}
-
-BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_interval_map_infix_caret_overload_4_bicremental_types, T, bicremental_types)
-{ interval_map_infix_caret_overload_4_bicremental_types<INTERVAL_MAP, T, int>();}
-*/
 BOOST_AUTO_TEST_CASE_TEMPLATE
 (test_itl_interval_map_find_4_bicremental_types, T, bicremental_types)
 { interval_map_find_4_bicremental_types<INTERVAL_MAP, T, int>();}

Modified: sandbox/itl/libs/itl/test/test_interval_map_mixed/test_interval_map_mixed.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_map_mixed/test_interval_map_mixed.cpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_map_mixed/test_interval_map_mixed.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::interval_map_mixed unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_interval_set_infix/test_interval_set_infix.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_infix/test_interval_set_infix.cpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_infix/test_interval_set_infix.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::interval_set_infix unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_interval_set_mixed/test_interval_set_mixed.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_interval_set_mixed/test_interval_set_mixed.cpp (original)
+++ sandbox/itl/libs/itl/test/test_interval_set_mixed/test_interval_set_mixed.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::interval_set_mixed unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_itl_map/test_itl_map.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_map/test_itl_map.cpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_map/test_itl_map.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::itl_map unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_partial_interval_quantifier/test_partial_interval_quantifier.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_partial_interval_quantifier/test_partial_interval_quantifier.cpp (original)
+++ sandbox/itl/libs/itl/test/test_partial_interval_quantifier/test_partial_interval_quantifier.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::partial_interval_quantifier unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_separate_interval_set/test_separate_interval_set.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_separate_interval_set/test_separate_interval_set.cpp (original)
+++ sandbox/itl/libs/itl/test/test_separate_interval_set/test_separate_interval_set.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::separate_interval_set unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_separate_interval_set_infix/test_separate_interval_set_infix.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_separate_interval_set_infix/test_separate_interval_set_infix.cpp (original)
+++ sandbox/itl/libs/itl/test/test_separate_interval_set_infix/test_separate_interval_set_infix.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::separate_interval_set_infix unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_set_inerval_set/test_set_interval_set.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_inerval_set/test_set_interval_set.cpp (original)
+++ sandbox/itl/libs/itl/test/test_set_inerval_set/test_set_interval_set.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::set_interval_set unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set.cpp (original)
+++ sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::set_itl_set unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_split_interval_map/test_split_interval_map.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_split_interval_map/test_split_interval_map.cpp (original)
+++ sandbox/itl/libs/itl/test/test_split_interval_map/test_split_interval_map.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::split_interval_set unit test
+#define BOOST_TEST_MODULE itl::split_interval_map unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_split_interval_set/test_split_interval_set.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_split_interval_set/test_split_interval_set.cpp (original)
+++ sandbox/itl/libs/itl/test/test_split_interval_set/test_split_interval_set.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::split_interval_set unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_split_interval_set_infix/test_split_interval_set_infix.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_split_interval_set_infix/test_split_interval_set_infix.cpp (original)
+++ sandbox/itl/libs/itl/test/test_split_interval_set_infix/test_split_interval_set_infix.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::split_interval_set_infix unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>

Modified: sandbox/itl/libs/itl/test/test_total_interval_quantifier/test_total_interval_quantifier.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_total_interval_quantifier/test_total_interval_quantifier.cpp (original)
+++ sandbox/itl/libs/itl/test/test_total_interval_quantifier/test_total_interval_quantifier.cpp 2009-06-09 09:12:22 EDT (Tue, 09 Jun 2009)
@@ -5,7 +5,7 @@
       (See accompanying file LICENCE.txt or copy at
            http://www.boost.org/LICENSE_1_0.txt)
 +-----------------------------------------------------------------------------*/
-#define BOOST_TEST_MODULE itl::interval_set unit test
+#define BOOST_TEST_MODULE itl::total_interval_quantifier unit test
 #include <string>
 #include <boost/mpl/list.hpp>
 #include <boost/test/unit_test.hpp>


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk