Subject: [Boost-commit] svn:boost r67065 - in trunk/libs/icl: doc example/boost_party_ test
From: afojgo_at_[hidden]
Date: 2010-12-06 08:01:59
Author: jofaber
Date: 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
New Revision: 67065
URL: http://svn.boost.org/trac/boost/changeset/67065
Log:
Fixed tweaks in the documents: Eliminated neutro... protonic... and aggrovering. Made the generator function for pointers more generic.
Text files modified:
trunk/libs/icl/doc/concepts.qbk | 6 +-
trunk/libs/icl/doc/examples.qbk | 4 +-
trunk/libs/icl/doc/interface.qbk | 6 +-
trunk/libs/icl/doc/introduction.qbk | 2
trunk/libs/icl/doc/semantics.qbk | 72 ++++++++++++++++++++--------------------
trunk/libs/icl/example/boost_party_/boost_party.cpp | 4 +-
trunk/libs/icl/test/fastest_partial_icl_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/fastest_partial_interval_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/fastest_total_icl_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/fastest_total_interval_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/test_icl_quantifier_shared.hpp | 8 ++--
trunk/libs/icl/test/test_interval_quantifier_shared.hpp | 8 ++--
trunk/libs/icl/test/test_interval_set_laws_shared.hpp | 4 +-
trunk/libs/icl/test/test_partial_icl_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/test_partial_interval_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/test_quantifier_icl_map.hpp | 4 +-
trunk/libs/icl/test/test_quantifier_map_shared.hpp | 4 +-
trunk/libs/icl/test/test_total_icl_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/test_total_interval_quantifier_cases.hpp | 6 +-
trunk/libs/icl/test/test_value_maker.hpp | 16 +-------
20 files changed, 88 insertions(+), 98 deletions(-)
Modified: trunk/libs/icl/doc/concepts.qbk
==============================================================================
--- trunk/libs/icl/doc/concepts.qbk (original)
+++ trunk/libs/icl/doc/concepts.qbk 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -180,11 +180,11 @@
for `Maps` we want to implement ['*aggregation*] on
the associated values for the case of collision (of key elements)
or overlap (of key intervals), which has been refered to as
-['*aggregate on overlap*] or ['*aggrovering*] above.
+['*aggregate on overlap*] above.
This kind of `Addability` and `Subtractability` allows to compute
a lot of useful aggregation results on an __itv_map_s__ associated
values, just by adding and subtracting value pairs.
-Various examples of ['*aggrovering*] are given in
+Various examples of ['*aggregate on overlap*] are given in
[link boost_icl.examples section examples].
In addition, this concept of `Addability` and `Subtractability`
contains the classical `Insertability` and `Erasability` of
@@ -418,7 +418,7 @@
A map that is modelled in this way, is one large vector with
a value `v` for every key `k` of it's domain type `DomainT`.
-But only protonic value are actually stored.
+But only non-identity values are actually stored.
This is the motivation for the definedness-Trait on `icl Maps`.
A ['*partial*] map models the intuitive view that only value
Modified: trunk/libs/icl/doc/examples.qbk
==============================================================================
--- trunk/libs/icl/doc/examples.qbk (original)
+++ trunk/libs/icl/doc/examples.qbk 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -85,10 +85,10 @@
time, where the group of party guests changed.
Party demonstrates a principle that we call
-['*aggregate on overlap (aggrovering)*]:
+['*aggregate on overlap*]:
On insertion a value associated to the interval is aggregated with those
values in the interval_map that overlap with the inserted value.
-There are two behavioral aspects to ['*aggrovering*]: a ['*decompositional
+There are two behavioral aspects to ['*aggregate on overlap*]: a ['*decompositional
behavior*] and an ['*accumulative behavior*].
* The ['*decompositional behavior*] splits up intervals on the /time/ /dimension/ of the
Modified: trunk/libs/icl/doc/interface.qbk
==============================================================================
--- trunk/libs/icl/doc/interface.qbk (original)
+++ trunk/libs/icl/doc/interface.qbk 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -321,9 +321,9 @@
``
So a type `DomainT` that is `incrementable` will
also have an `unit_element`. If it does not, a `unit_element` can be provided.
-An `unit_element` can be any value, that is greater as the `neutron` value
+A `unit_element` can be any value, that is greater as the `identity_element`
in the `Compare` order given.
-An example of a type, that has a `neutron` but no increment is
+An example of a type, that has an `identity_element` but no increment operation is
`string`. So for `std::string` a unit_element is implemented like this:
``
// Smallest 'visible' string that is greater than the empty string.
@@ -427,7 +427,7 @@
In the icl's design we make the assumption,
in particular for the default setting of parameters
`Combine = `[classref boost::icl::inplace_minus inplace_plus],
-that type `CodomainT` has a neutral element or `neutron`
+that type `CodomainT` has a neutral element or `identity_element`
with respect to the `Combine` functor.
Modified: trunk/libs/icl/doc/introduction.qbk
==============================================================================
--- trunk/libs/icl/doc/introduction.qbk (original)
+++ trunk/libs/icl/doc/introduction.qbk 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -142,7 +142,7 @@
[h4 Aggregate on Overlap]
This is a first motivating example of a very small party, demonstrating the
-['*aggregate on overlap*] principle ['*(aggrovering)*] on __itv_maps__:
+['*aggregate on overlap*] principle on __itv_maps__:
In the example Mary enters the party first. She attends during the
time interval `[20:00,22:00)`. Harry enters later. He stays within `[21:00,23:00)`.
Modified: trunk/libs/icl/doc/semantics.qbk
==============================================================================
--- trunk/libs/icl/doc/semantics.qbk (original)
+++ trunk/libs/icl/doc/semantics.qbk 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -142,7 +142,7 @@
For the operation ['*set union*] available as
`operator +, +=, |, |=` and the neutral element
-`neutron<S>::value()` which is the empty set `S()`
+`identity_element<S>::value()` which is the empty set `S()`
these laws hold:
``
Associativity<S,+,== >: S a,b,c; a+(b+c) == (a+b)+c
@@ -399,10 +399,10 @@
This problem can be dealt with in two ways.
# Deleting value pairs form the Collector, if it's associated value
- becomes a neutral value or `neutron`.
-# Using a different equality, called protonic equality in the laws
- to validate. Protonic equality only
- accounts for value pairs that that carry values unequal to the `neutron` value.
+ becomes a neutral value or `identity_element`.
+# Using a different equality, called distinct equality in the laws
+ to validate. Distinct equality only
+ accounts for value pairs that that carry values unequal to the `identity_element`.
Solution (1) led to the introduction of map traits, particularly trait
['*partial_absorber*], which is the default setting in all icl's map
@@ -410,10 +410,10 @@
Solution (2), is applied to check the semantics of icl::Maps for the
partial_enricher trait that does not delete value pairs that carry
-neutrons. Protonic equality is implemented by a non member function
-called `is_protonic_equal`. Throughout this chapter
-protonic equality in pseudocode and law denotations is denoted
-as `=p=` operator.
+identity elements. Distinct equality is implemented by a non member function
+called `is_distinct_equal`. Throughout this chapter
+distinct equality in pseudocode and law denotations is denoted
+as `=d=` operator.
The validity of the sets of laws that make up `Set` semantics
should now be quite evident. So the following text shows the
@@ -439,7 +439,7 @@
All the fundamental laws could be validated for all
icl Maps in their instantiation as Maps of Sets or Collectors.
-As expected Inversion only holds for protonic equality,
+As expected, Inversion only holds for distinct equality,
if the map is not a `partial_absorber`.
``
@@ -448,7 +448,7 @@
Neutrality == ==
Commutativity == ==
Inversion partial_absorber ==
- partial_enricher =p=
+ partial_enricher =d=
``
[h5 Distributivity Laws]
@@ -494,9 +494,9 @@
``
Reviewing the validity tables above shows, that the sets of valid laws for
-`icl Sets` and `icl Maps of Sets` that are /neutron absorbing/ are exactly the same.
+`icl Sets` and `icl Maps of Sets` that are /identity absorbing/ are exactly the same.
As expected, only for Maps of Sets that represent empty sets as associated values,
-called /neutron enrichers/, there are marginal semantic differences.
+called /identity enrichers/, there are marginal semantic differences.
[endsect][/ Collectors]
@@ -632,12 +632,12 @@
valid for `Collectors`:
``
- + & -
-Associativity == ==
-Neutrality == ==
-Commutativity == ==
-Inversion absorbs_neutrons ==
- enriches_neutrons =p=
+ + & -
+Associativity == ==
+Neutrality == ==
+Commutativity == ==
+Inversion absorbs_identities ==
+ enriches_identities =d=
``
The subset of laws, that relates to `operator +` and the neutral
@@ -656,12 +656,12 @@
`signed Quantifiers`, the pattern of valid
laws is somewhat different:
``
- + & -
-Associativity =v= =v=
-Neutrality == ==
-Commutativity == ==
-Inversion absorbs_neutrons ==
- enriches_neutrons =p=
+ + & -
+Associativity =v= =v=
+Neutrality == ==
+Commutativity == ==
+Inversion absorbs_identities ==
+ enriches_identities =d=
``
The differences are tagged as `=v=` indicating, that
@@ -682,17 +682,17 @@
For `operator &` the associativity is broken for all maps
that are partial absorbers. For total absorbers associativity
-is valid for element equality. All maps having the neutron enricher
+is valid for element equality. All maps having the /identity enricher/
Trait are associative wrt. lexicographical equality `==`.
``
-Associativity &
- absorbs_neutrons && !is_total false
- absorbs_neutrons && is_total =e=
- enriches_neutrons ==
+Associativity &
+ absorbs_identities && !is_total false
+ absorbs_identities && is_total =e=
+ enriches_identities ==
``
Note, that all laws that establish a commutative
-monoid for `operator +` and neutron `Q()` are valid
+monoid for `operator +` and identity element `Q()` are valid
for `signed Quantifiers`.
In addition symmetric difference that does not
hold for `unsigned Qunatifiers` is valid
@@ -748,11 +748,11 @@
of icl maps.
[table
-[[] [is model of] [if] [example]]
-[[`Map<D,Monoid>`] [`Modoid`] [] [`interval_map<int,string>`]]
-[[`Map<D,Set,Trait>`] [`Set`] [`Trait::absorbs_neutrons`][`interval_map<int,std::set<int> >`]]
-[[`Map<D,CommutativeMonoid>`][`CommutativeMonoid`][] [`interval_map<int,unsigned int>`]]
-[[`Map<D,CommutativeGroup>`] [`CommutativeGroup`] [`Trait::is_total`] [`interval_map<int,int,total_absorber>`]]
+[[] [is model of] [if] [example]]
+[[`Map<D,Monoid>`] [`Modoid`] [] [`interval_map<int,string>`]]
+[[`Map<D,Set,Trait>`] [`Set`] [`Trait::absorbs_identities`][`interval_map<int,std::set<int> >`]]
+[[`Map<D,CommutativeMonoid>`][`CommutativeMonoid`][] [`interval_map<int,unsigned int>`]]
+[[`Map<D,CommutativeGroup>`] [`CommutativeGroup`] [`Trait::is_total`] [`interval_map<int,int,total_absorber>`]]
]
[endsect][/ Concept Induction]
Modified: trunk/libs/icl/example/boost_party_/boost_party.cpp
==============================================================================
--- trunk/libs/icl/example/boost_party_/boost_party.cpp (original)
+++ trunk/libs/icl/example/boost_party_/boost_party.cpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -31,11 +31,11 @@
time, where the group of party guests changed.
boost_party.cpp demonstrates a principle that we call
- <b><em>aggregate on overlap (aggrovering;)</em></b>:
+ <b><em>aggregate on overlap</em></b>:
On insertion a value associated to the interval is aggregated (added) to those
values in the interval_map that overlap with the inserted value.
- There are two behavioral aspects to <b>aggrovering</b>: a <em>decompositional
+ There are two behavioral aspects to <b>aggregate on overlap</b>: a <em>decompositional
behavior</em> and a <em>accumulative behavior</em>.
The <em>decompositional behavior</em> splits up intervals on the time dimension of the
Modified: trunk/libs/icl/test/fastest_partial_icl_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/fastest_partial_icl_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/fastest_partial_icl_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -51,14 +51,14 @@
(fastest_itl_partial_enricher_icl_quantifier_check_abelian_monoid_et_4_bicremental_types)
{ icl_quantifier_check_abelian_monoid_et_4_bicremental_types<bicremental_type_1, int, partial_enricher, INTERVAL_MAP>();}
-// x - x =p= 0 | partial enricher
+// x - x =d= 0 | partial enricher
BOOST_AUTO_TEST_CASE
(fastest_itl_partial_enricher_icl_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types)
{ icl_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types<bicremental_type_2, int, partial_enricher, INTERVAL_MAP>();}
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
// Containedness
Modified: trunk/libs/icl/test/fastest_partial_interval_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/fastest_partial_interval_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/fastest_partial_interval_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -51,14 +51,14 @@
(fastest_itl_partial_enricher_itv_quantifier_check_abelian_monoid_et_4_bicremental_types)
{ itv_quantifier_check_abelian_monoid_et_4_bicremental_types<bicremental_type_1, int, partial_enricher, INTERVAL_MAP>();}
-// x - x =p= 0 | partial enricher
+// x - x =d= 0 | partial enricher
BOOST_AUTO_TEST_CASE
(fastest_itl_partial_enricher_itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types)
{ itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types<bicremental_type_2, int, partial_enricher, INTERVAL_MAP>();}
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
Modified: trunk/libs/icl/test/fastest_total_icl_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/fastest_total_icl_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/fastest_total_icl_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -59,7 +59,7 @@
(fastest_itl_total_enricher_icl_quantifier_check_abelian_monoid_et_4_bicremental_types)
{ icl_quantifier_check_abelian_monoid_et_4_bicremental_types<bicremental_type_1, double, total_enricher, INTERVAL_MAP>();}
-// (0-x) + x =p= 0 | total absorber
+// (0-x) + x =d= 0 | total absorber
BOOST_AUTO_TEST_CASE
(fastest_itl_total_enricher_icl_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_domain_discrete_codomain)
{ icl_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types<bicremental_type_2, int, total_enricher, INTERVAL_MAP>();}
@@ -74,8 +74,8 @@
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
Modified: trunk/libs/icl/test/fastest_total_interval_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/fastest_total_interval_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/fastest_total_interval_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -59,7 +59,7 @@
(fastest_itl_total_enricher_itv_quantifier_check_abelian_monoid_et_4_bicremental_types)
{ itv_quantifier_check_abelian_monoid_et_4_bicremental_types<bicremental_type_1, double, total_enricher, INTERVAL_MAP>();}
-// (0-x) + x =p= 0 | total absorber
+// (0-x) + x =d= 0 | total absorber
BOOST_AUTO_TEST_CASE
(fastest_itl_total_enricher_itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_domain_discrete_codomain)
{ itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types<bicremental_type_2, int, total_enricher, INTERVAL_MAP>();}
@@ -73,8 +73,8 @@
{ itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types<bicremental_type_4, boost::rational<int>, total_enricher, INTERVAL_MAP>();}
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
Modified: trunk/libs/icl/test/test_icl_quantifier_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_icl_quantifier_shared.hpp (original)
+++ trunk/libs/icl/test/test_icl_quantifier_shared.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -153,7 +153,7 @@
}
//------------------------------------------------------------------------------
-// Abelian partial invertive monoid with protonic equality for inversion
+// Abelian partial invertive monoid with distinct equality for inversion
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
@@ -195,15 +195,15 @@
}
//------------------------------------------------------------------------------
-// (0 - x) + x =p= 0
+// (0 - x) + x =d= 0
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
void icl_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
{
- // check abelian group wrt. + and inverability wrt. protonic equality =p= :
+ // check abelian group wrt. + and inverability wrt. distinct equality =d= :
// (1) (IntervalMapT, +) is an abelian group and
- // (2) The inverability law: (0 - x) + x =p= 0 holds.
+ // (2) The inverability law: (0 - x) + x =d= 0 holds.
typedef IntervalMap<T,U,Trt> IntervalMapT;
typedef icl::map<T,U,Trt> MapT;
IntervalMapT aux;
Modified: trunk/libs/icl/test/test_interval_quantifier_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_quantifier_shared.hpp (original)
+++ trunk/libs/icl/test/test_interval_quantifier_shared.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -114,7 +114,7 @@
}
//------------------------------------------------------------------------------
-// Abelian partial invertive monoid with protonic equality for inversion
+// Abelian partial invertive monoid with distinct equality for inversion
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
@@ -154,15 +154,15 @@
}
//------------------------------------------------------------------------------
-// (0 - x) + x =p= 0
+// (0 - x) + x =d= 0
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
void itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types()
{
- // check abelian group wrt. + and inverability wrt. protonic equality =p= :
+ // check abelian group wrt. + and inverability wrt. distinct equality =d= :
// (1) (IntervalMapT, +) is an abelian group and
- // (2) The inverability law: (0 - x) + x =p= 0 holds.
+ // (2) The inverability law: (0 - x) + x =d= 0 holds.
typedef IntervalMap<T,U,Trt> IntervalMapT;
IntervalMapT map_a, map_b, map_c;
typename IntervalMapT::interval_mapping_type val_pair;
Modified: trunk/libs/icl/test/test_interval_set_laws_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_interval_set_laws_shared.hpp (original)
+++ trunk/libs/icl/test/test_interval_set_laws_shared.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -108,7 +108,7 @@
}
//------------------------------------------------------------------------------
-// Abelian partial invertive monoid with protonic equality for inversion
+// Abelian partial invertive monoid with distinct equality for inversion
//------------------------------------------------------------------------------
template <class T, ICL_IntervalSet_TEMPLATE(_T) IntervalSet>
void interval_set_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types()
@@ -154,7 +154,7 @@
}
//------------------------------------------------------------------------------
-// (0 - x) + x =p= 0 |
+// (0 - x) + x =d= 0 |
//------------------------------------------------------------------------------
template <class T, ICL_IntervalSet_TEMPLATE(_T) IntervalSet>
void interval_set_check_abelian_group_plus_prot_inv_4_bicremental_types()
Modified: trunk/libs/icl/test/test_partial_icl_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/test_partial_icl_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/test_partial_icl_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -51,14 +51,14 @@
(test_itl_partial_enricher_icl_quantifier_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
{ icl_quantifier_check_abelian_monoid_et_4_bicremental_types<T, int, partial_enricher, INTERVAL_MAP>();}
-// x - x =p= 0 | partial enricher
+// x - x =d= 0 | partial enricher
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_partial_enricher_icl_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types, T, bicremental_types)
{ icl_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types<T, int, partial_enricher, INTERVAL_MAP>();}
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
// Containedness
Modified: trunk/libs/icl/test/test_partial_interval_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/test_partial_interval_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/test_partial_interval_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -51,14 +51,14 @@
(test_itl_partial_enricher_itv_quantifier_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
{ itv_quantifier_check_abelian_monoid_et_4_bicremental_types<T, int, partial_enricher, INTERVAL_MAP>();}
-// x - x =p= 0 | partial enricher
+// x - x =d= 0 | partial enricher
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_partial_enricher_itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types, T, bicremental_types)
{ itv_quantifier_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types<T, int, partial_enricher, INTERVAL_MAP>();}
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
Modified: trunk/libs/icl/test/test_quantifier_icl_map.hpp
==============================================================================
--- trunk/libs/icl/test/test_quantifier_icl_map.hpp (original)
+++ trunk/libs/icl/test/test_quantifier_icl_map.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -143,7 +143,7 @@
}
//------------------------------------------------------------------------------
-// Abelian partial invertive monoid with protonic equality for inversion
+// Abelian partial invertive monoid with distinct equality for inversion
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
@@ -203,7 +203,7 @@
}
//------------------------------------------------------------------------------
-// (0 - x) + x =p= 0 |
+// (0 - x) + x =d= 0 |
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
Modified: trunk/libs/icl/test/test_quantifier_map_shared.hpp
==============================================================================
--- trunk/libs/icl/test/test_quantifier_map_shared.hpp (original)
+++ trunk/libs/icl/test/test_quantifier_map_shared.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -113,7 +113,7 @@
}
//------------------------------------------------------------------------------
-// Abelian partial invertive monoid with protonic equality for inversion
+// Abelian partial invertive monoid with distinct equality for inversion
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
@@ -161,7 +161,7 @@
}
//------------------------------------------------------------------------------
-// (0 - x) + x =p= 0 |
+// (0 - x) + x =d= 0 |
//------------------------------------------------------------------------------
template <class T, class U, class Trt,
ICL_IntervalMap_TEMPLATE(_T,_U,Traits,Trt) IntervalMap>
Modified: trunk/libs/icl/test/test_total_icl_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/test_total_icl_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/test_total_icl_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -59,7 +59,7 @@
(test_itl_total_enricher_itv_quantifier_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
{ itv_quantifier_check_abelian_monoid_et_4_bicremental_types<T, float, total_enricher, INTERVAL_MAP>();}
-// (0-x) + x =p= 0 | total absorber
+// (0-x) + x =d= 0 | total absorber
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_total_enricher_itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_domain_and_discrete_codomain, T, bicremental_types)
{ itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types<T, int, total_enricher, INTERVAL_MAP>();}
@@ -74,8 +74,8 @@
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
#endif // BOOST_ICL_TEST_TOTAL_ICL_QUANTIFIER_CASES_HPP_JOFA_100819
Modified: trunk/libs/icl/test/test_total_interval_quantifier_cases.hpp
==============================================================================
--- trunk/libs/icl/test/test_total_interval_quantifier_cases.hpp (original)
+++ trunk/libs/icl/test/test_total_interval_quantifier_cases.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -59,7 +59,7 @@
(test_itl_total_enricher_itv_quantifier_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
{ itv_quantifier_check_abelian_monoid_et_4_bicremental_types<T, float, total_enricher, INTERVAL_MAP>();}
-// (0-x) + x =p= 0 | total absorber
+// (0-x) + x =d= 0 | total absorber
BOOST_AUTO_TEST_CASE_TEMPLATE
(test_itl_total_enricher_itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_domain_and_discrete_codomain, T, bicremental_types)
{ itv_quantifier_check_abelian_group_plus_prot_inv_4_bicremental_types<T, int, total_enricher, INTERVAL_MAP>();}
@@ -74,8 +74,8 @@
// absorber enricher
-// partial x - x == 0 x - x =p= 0 partiality of subtraction
-// total (-x)+ x == 0 (-x)+ x =p= 0 totality of subtraction
+// partial x - x == 0 x - x =d= 0 partiality of subtraction
+// total (-x)+ x == 0 (-x)+ x =d= 0 totality of subtraction
//------------------------------------------------------------------------------
// Inner complement
Modified: trunk/libs/icl/test/test_value_maker.hpp
==============================================================================
--- trunk/libs/icl/test/test_value_maker.hpp (original)
+++ trunk/libs/icl/test/test_value_maker.hpp 2010-12-06 08:01:55 EST (Mon, 06 Dec 2010)
@@ -14,16 +14,6 @@
namespace boost{ namespace icl
{
-/*FYI completion like that:
-std::string make(int n)
-{
- std::string value = identity_element<std::string>::value();
- int abs_n = n<0 ? -n : n;
- for(int i=1; i<abs_n; i++)
- value += i%2==1 ? "hello " : "world ";
-}
-*/
-
struct mono
{
mono(){};
@@ -81,11 +71,11 @@
struct test_value<Type*>
{
- static bool map_integers(int values[], int size)
+ static bool map_integers(Type values[], int size)
{
static const int offset = size/2;
for(int idx = 0; idx < size; idx++)
- values[idx] = idx - offset;
+ values[idx] = test_value<Type>::make(idx - offset);
return true;
}
@@ -95,7 +85,7 @@
static bool initialized;
static const int size = 100;
static const int offset = size/2;
- static int values[size];
+ static Type values[size];
if(!initialized)
initialized = map_integers(values, size);