|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r51451 - in sandbox/itl: boost/itl boost/validate/validater libs/itl/test libs/itl/test/test_casual libs/itl/test/test_interval_map_mixed libs/itl/test/test_itl_map libs/itl/test/test_quantifier_itl_map libs/itl/test/test_quantifier_map libs/itl/test/test_set_itl_set libs/validate/example/labat_collector libs/validate/example/labat_itl_morphic libs/validate/example/labat_itl_order libs/validate/example/labat_itl_set libs/validate/example/labat_signed_quantifier libs/validate/example/labat_single libs/validate/example/labat_unsigned_quantifier libs/validate/example/labat_val_relations
From: afojgo_at_[hidden]
Date: 2009-02-26 10:16:28
Author: jofaber
Date: 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
New Revision: 51451
URL: http://svn.boost.org/trac/boost/changeset/51451
Log:
Bugfixes refactoring. Ran LaBatea tests in debug mode using option /bigobj.
Bugs found and fixed for symmetric difference function flip.
Stable {msvc-9.0, partly congcc-4.3-a7}
Text files modified:
sandbox/itl/boost/itl/interval.hpp | 6 ------
sandbox/itl/boost/itl/interval_base_map.hpp | 21 +++++++++++++--------
sandbox/itl/boost/itl/interval_maps.hpp | 20 ++++++++++++++++++++
sandbox/itl/boost/itl/map_algo.hpp | 3 ++-
sandbox/itl/boost/itl/split_interval_map.hpp | 4 +++-
sandbox/itl/boost/validate/validater/algebra_validater.hpp | 1 -
sandbox/itl/boost/validate/validater/law_validater.hpp | 7 ++++++-
sandbox/itl/libs/itl/test/test_casual/test_casual.cpp | 14 +++++---------
sandbox/itl/libs/itl/test/test_interval_map_mixed/test_interval_map_mixed.cpp | 3 +++
sandbox/itl/libs/itl/test/test_itl_map/test_itl_map_shared.cpp | 2 +-
sandbox/itl/libs/itl/test/test_quantifier_itl_map/test_quantifier_itl_map_shared.cpp | 40 ++++++++++++++++++++--------------------
sandbox/itl/libs/itl/test/test_quantifier_map/vc9_test_quantifier_map.vcproj | 1 +
sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set_shared.cpp | 8 ++++----
sandbox/itl/libs/itl/test/test_type_lists.hpp | 4 ++--
sandbox/itl/libs/validate/example/labat_collector/vc9_labat_collector.vcproj | 1 +
sandbox/itl/libs/validate/example/labat_itl_morphic/vc9_labat_itl_morphic.vcproj | 1 +
sandbox/itl/libs/validate/example/labat_itl_order/vc9_labat_itl_order.vcproj | 1 +
sandbox/itl/libs/validate/example/labat_itl_set/vc9_labat_itl_set.vcproj | 1 +
sandbox/itl/libs/validate/example/labat_signed_quantifier/vc9_labat_signed_quantifier.vcproj | 1 +
sandbox/itl/libs/validate/example/labat_single/labat_single.cpp | 28 ++++++++++++++--------------
sandbox/itl/libs/validate/example/labat_unsigned_quantifier/vc9_labat_unsigned_quantifier.vcproj | 9 +++++----
sandbox/itl/libs/validate/example/labat_val_relations/vc9_labat_val_relations.vcproj | 1 +
22 files changed, 105 insertions(+), 72 deletions(-)
Modified: sandbox/itl/boost/itl/interval.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval.hpp (original)
+++ sandbox/itl/boost/itl/interval.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -249,12 +249,6 @@
//==========================================================================
/** Intersection with the interval <tt>x2</tt>; assign result to <tt>isec</tt> */
- // void intersect(interval& isec, const interval& x2)const
- //{
- // isec = *this;
- // isec &= x2;
- //}
-
interval& operator &= (const interval& sectant)
{
set_lwb(lwb_max(sectant));
Modified: sandbox/itl/boost/itl/interval_base_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_base_map.hpp (original)
+++ sandbox/itl/boost/itl/interval_base_map.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -828,6 +828,10 @@
interval_type covered, left_over, common_interval;
const codomain_type& x_value = interval_value_pair.CONT_VALUE;
typename ImplMapT::const_iterator it = fst_it;
+
+ interval_set<DomainT,Compare,Interval,Alloc> eraser;
+ interval_base_map intersection;
+
while(it != end_it)
{
const codomain_type& co_value = it->CONT_VALUE;
@@ -842,15 +846,16 @@
if(!common_interval.empty())
{
// ... shall be subtracted
+ eraser.add(common_interval);
+
if(is_set<codomain_type>::value)
{
codomain_type common_value = x_value;
inverse_codomain_intersect()(common_value, co_value);
- erase(common_interval);
- add(value_type(common_interval, common_value));
+ intersection.add(value_type(common_interval, common_value));
}
else
- subtract(value_type(common_interval, co_value));
+ intersection.add(value_type(common_interval, neutron<codomain_type>::value()));
}
add(value_type(left_over, x_value)); //That which is not shall be added
@@ -865,9 +870,9 @@
//If span is not empty here, it is not in the set so it shall be added
add(value_type(span, x_value));
- if(Traits::is_total && !Traits::absorbs_neutrons)
- FORALL(typename ImplMapT, it_, _map)
- it_->CONT_VALUE = neutron<codomain_type>::value();
+ //finally rewrite the common segments
+ erase(eraser);
+ (*this) += intersection;
return *that();
}
@@ -924,7 +929,7 @@
// All elements of operand left of the common range are added
while(it != common_lwb)
add(*it++);
- // All elements of operand in the common range are symmertrically subtracted
+ // All elements of operand in the common range are symmetrically subtracted
while(it != common_upb)
flip(*it++);
// All elements of operand right of the common range are added
@@ -967,7 +972,7 @@
it++; nxt++;
while( nxt != _map.end()
&& (*it).KEY_VALUE.touches((*nxt).KEY_VALUE)
- && (*it).CONT_VALUE == (*nxt).CONT_VALUE ) //CodomainT::OP ==
+ && (*it).CONT_VALUE == (*nxt).CONT_VALUE )
{ it++; nxt++; }
// finally we arrive at the end of a sequence of joinable intervals
Modified: sandbox/itl/boost/itl/interval_maps.hpp
==============================================================================
--- sandbox/itl/boost/itl/interval_maps.hpp (original)
+++ sandbox/itl/boost/itl/interval_maps.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -373,6 +373,26 @@
return object;
}
+template
+<
+ class ObjectT,
+ class SubType, class DomainT, class CodomainT, class Traits,
+ ITL_COMPARE Compare, ITL_COMBINE Combine, ITL_SECTION Section, template<class,ITL_COMPARE>class Interval, ITL_ALLOC Alloc
+>
+ObjectT& operator +=
+(
+ ObjectT& object,
+ const interval_base_map<SubType,DomainT,CodomainT,Traits,Compare,Combine,Section,Interval,Alloc>& operand
+)
+{
+ typedef interval_base_map<SubType,DomainT,CodomainT,
+ Traits,Compare,Combine,Section,Interval,Alloc> operand_type;
+ const_FORALL(typename operand_type, elem_, operand)
+ object.add(*elem_);
+
+ return object;
+}
+
//-----------------------------------------------------------------------------
// subtraction -=
//-----------------------------------------------------------------------------
Modified: sandbox/itl/boost/itl/map_algo.hpp
==============================================================================
--- sandbox/itl/boost/itl/map_algo.hpp (original)
+++ sandbox/itl/boost/itl/map_algo.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -136,9 +136,10 @@
{
typename MapType::iterator res_ = insertion.ITERATOR;
typename MapType::codomain_type common_value = res_->CONT_VALUE;
+ typename MapType::key_type key_value = res_->KEY_VALUE;
MapType::inverse_codomain_intersect()(common_value, cur_x2_->CONT_VALUE);
result.subtract(*res_);
- result.add(MapType::value_type(res_->KEY_VALUE, common_value));
+ result.add(MapType::value_type(key_value, common_value));
}
else
result.subtract(*insertion.ITERATOR);
Modified: sandbox/itl/boost/itl/split_interval_map.hpp
==============================================================================
--- sandbox/itl/boost/itl/split_interval_map.hpp (original)
+++ sandbox/itl/boost/itl/split_interval_map.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -454,8 +454,10 @@
CodomainT cmb_val = cur_val ;
Combiner()(cmb_val, x_val);
+ // I have to compute intersec here, because reference cur_itv will be invalid after erase(it);
+ interval_type interSec = cur_itv & x_itv;
this->_map.erase(it);
- fill(value_type(cur_itv & x_itv, cmb_val));
+ fill(value_type(interSec, cmb_val));
fill(value_type(rightResid, cur_val));
}
}
Modified: sandbox/itl/boost/validate/validater/algebra_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/algebra_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/algebra_validater.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -36,7 +36,6 @@
inline int algebra_validater::share(int total, int& index, int& rest_shares)
{
- BOOST_ASSERT(index_ == index);
int count = total - index;
int share = rest_shares / count;
rest_shares -= share;
Modified: sandbox/itl/boost/validate/validater/law_validater.hpp
==============================================================================
--- sandbox/itl/boost/validate/validater/law_validater.hpp (original)
+++ sandbox/itl/boost/validate/validater/law_validater.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -49,7 +49,12 @@
typedef typename Loki::tuple<gentor_types> input_gentor;
public:
- LawValidater(){ setTrialsCount(250); } //1000(std)//JODO config at only ONE location
+#ifdef _DEBUG
+ static const int default_trials_count = 20;
+#else
+ static const int default_trials_count = 250;
+#endif
+ LawValidater(){ setTrialsCount(default_trials_count); }
void setTrialsCount(int trials)
{
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-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -61,17 +61,13 @@
{
typedef int T;
typedef itl::map<int,int> ItlMapT;
- typedef interval_map<int,int> IntervalMapT;
+ typedef interval_map<int,int,partial_enricher> IntervalMapT;
typedef split_interval_map<int,int> SplitIntervalMapT;
IntervalMapT left, right;
- left.add(IDv(1,3,1));
- BOOST_CHECK_EQUAL(IntervalMapT().add(IDv(1,3,1))(2), 1);
- BOOST_CHECK_EQUAL(IntervalMapT().add(IDv(1,3,1))(3) == 1, false);
- BOOST_CHECK_EQUAL(IntervalMapT().add(IDv(1,3,1))(3), 0);
- BOOST_CHECK_EQUAL(SplitIntervalMapT().add(IDv(1,3,1))(2), 1);
- BOOST_CHECK_EQUAL(SplitIntervalMapT().add(IDv(1,3,1))(3) == 1, false);
- BOOST_CHECK_EQUAL(ItlMapT().add(sK_v(2,1))(2), 1);
- BOOST_CHECK_EQUAL(ItlMapT().add(sK_v(2,1))(3) == 1, false);
+ left .add(IIv(0,0,1)).add(IIv(1,1,2));
+ right.add(IIv(0,0,-1));
+
+ left ^= right;
}
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-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -1248,6 +1248,9 @@
join_a .add(CDv(1,3,1)).add(IDv(8,9,1)).add(IIv(6,11,3));
split_a.add(IDv(0,9,2)).add(IIv(3,6,1)).add(IDv(5,7,1));
+ join_b .add(CDv(1,3,1)).add(IIv(6,11,3));
+ split_b.add(IDv(0,9,2)).add(IIv(3,6,1));
+
BOOST_CHECK_EQUAL(split_a - join_a, (split_b = split_a) -= join_a);
BOOST_CHECK_EQUAL(split_a - join_a, split_b);
Modified: sandbox/itl/libs/itl/test/test_itl_map/test_itl_map_shared.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_itl_map/test_itl_map_shared.cpp (original)
+++ sandbox/itl/libs/itl/test/test_itl_map/test_itl_map_shared.cpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -7,6 +7,6 @@
+-----------------------------------------------------------------------------*/
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_itl_map_find_4_bicremental_types, T, bicremental_types)
+(test_itl_itl_map_find_4_bicremental_types, T, discrete_types)
{ itl_map_find_4_bicremental_types<T, int, partial_absorber, interval_map>();}
Modified: sandbox/itl/libs/itl/test/test_quantifier_itl_map/test_quantifier_itl_map_shared.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_quantifier_itl_map/test_quantifier_itl_map_shared.cpp (original)
+++ sandbox/itl/libs/itl/test/test_quantifier_itl_map/test_quantifier_itl_map_shared.cpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -10,24 +10,24 @@
// partial_absorber
//------------------------------------------------------------------------------
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_quantifier_map_check_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_quantifier_map_check_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_plus_4_bicremental_types<T, std::string, partial_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_quantifier_map_check_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_quantifier_map_check_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_et_4_bicremental_types<T, int, partial_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_plus_4_bicremental_types<T, std::string, partial_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_et_4_bicremental_types<T, int, partial_absorber, interval_map>();}
// x - x = 0 | partial absorber
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_quantifier_map_check_partial_invertive_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_quantifier_map_check_partial_invertive_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_partial_invertive_monoid_plus_4_bicremental_types<T, int, partial_absorber, interval_map>();}
@@ -35,48 +35,48 @@
// total_absorber
//------------------------------------------------------------------------------
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_quantifier_map_check_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_total_quantifier_map_check_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_plus_4_bicremental_types<T, std::string, total_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_quantifier_map_check_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_total_quantifier_map_check_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_et_4_bicremental_types<T, int, total_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_total_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_plus_4_bicremental_types<T, std::string, total_absorber, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_total_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_et_4_bicremental_types<T, int, total_absorber, interval_map>();}
// (0-x) + x = 0 | total absorber
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_quantifier_map_check_abelian_group_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_total_quantifier_map_check_abelian_group_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_group_plus_4_bicremental_types<T, int, total_absorber, interval_map>();}
//------------------------------------------------------------------------------
// partial_enricher
//------------------------------------------------------------------------------
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_enricher_quantifier_map_check_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_enricher_quantifier_map_check_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_plus_4_bicremental_types<T, std::string, partial_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_enricher_quantifier_map_check_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_enricher_quantifier_map_check_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_et_4_bicremental_types<T, int, partial_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_enricher_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_enricher_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_plus_4_bicremental_types<T, std::string, partial_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_enricher_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_enricher_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_et_4_bicremental_types<T, int, partial_enricher, interval_map>();}
// x - x =p= 0 | partial enricher
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_partial_enricher_quantifier_map_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types, T, bicremental_types)
+(test_itl_partial_enricher_quantifier_map_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_partial_invertive_monoid_plus_prot_inv_4_bicremental_types<T, int, partial_enricher, interval_map>();}
@@ -84,24 +84,24 @@
// total_enricher
//------------------------------------------------------------------------------
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_enricher_quantifier_map_check_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_total_enricher_quantifier_map_check_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_plus_4_bicremental_types<T, std::string, total_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_enricher_quantifier_map_check_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_total_enricher_quantifier_map_check_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_monoid_et_4_bicremental_types<T, int, total_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_enricher_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_total_enricher_quantifier_map_check_abelian_monoid_plus_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_plus_4_bicremental_types<T, std::string, total_enricher, interval_map>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_enricher_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_total_enricher_quantifier_map_check_abelian_monoid_et_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_monoid_et_4_bicremental_types<T, int, total_enricher, interval_map>();}
// (0-x) + x =p= 0 | total absorber
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_total_enricher_quantifier_map_check_abelian_group_plus_prot_inv_4_bicremental_types, T, bicremental_types)
+(test_itl_total_enricher_quantifier_map_check_abelian_group_plus_prot_inv_4_bicremental_types, T, discrete_types)
{ quantifier_map_check_abelian_group_plus_prot_inv_4_bicremental_types<T, int, total_enricher, interval_map>();}
Modified: sandbox/itl/libs/itl/test/test_quantifier_map/vc9_test_quantifier_map.vcproj
==============================================================================
--- sandbox/itl/libs/itl/test/test_quantifier_map/vc9_test_quantifier_map.vcproj (original)
+++ sandbox/itl/libs/itl/test/test_quantifier_map/vc9_test_quantifier_map.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set_shared.cpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set_shared.cpp (original)
+++ sandbox/itl/libs/itl/test/test_set_itl_set/test_set_itl_set_shared.cpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -10,19 +10,19 @@
// interval_set
//------------------------------------------------------------------------------
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_itl_set_check_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_itl_set_check_monoid_plus_4_bicremental_types, T, discrete_types)
{ itl_set_check_monoid_plus_4_bicremental_types<T, interval_set>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_itl_set_check_abelian_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_itl_set_check_abelian_monoid_plus_4_bicremental_types, T, discrete_types)
{ itl_set_check_abelian_monoid_plus_4_bicremental_types<T, interval_set>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_itl_set_check_abelian_monoid_et_4_bicremental_types, T, bicremental_types)
+(test_itl_itl_set_check_abelian_monoid_et_4_bicremental_types, T, discrete_types)
{ itl_set_check_abelian_monoid_et_4_bicremental_types<T, interval_set>();}
BOOST_AUTO_TEST_CASE_TEMPLATE
-(test_itl_itl_set_check_partial_invertive_monoid_plus_4_bicremental_types, T, bicremental_types)
+(test_itl_itl_set_check_partial_invertive_monoid_plus_4_bicremental_types, T, discrete_types)
{ itl_set_check_partial_invertive_monoid_plus_4_bicremental_types<T, interval_set>();}
Modified: sandbox/itl/libs/itl/test/test_type_lists.hpp
==============================================================================
--- sandbox/itl/libs/itl/test/test_type_lists.hpp (original)
+++ sandbox/itl/libs/itl/test/test_type_lists.hpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -29,8 +29,8 @@
//DBG short list for debugging
typedef ::boost::mpl::list<
- int
-> debug_int_type;
+ float
+> debug_type_list;
typedef ::boost::mpl::list<
float, double
Modified: sandbox/itl/libs/validate/example/labat_collector/vc9_labat_collector.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_collector/vc9_labat_collector.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_collector/vc9_labat_collector.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/validate/example/labat_itl_morphic/vc9_labat_itl_morphic.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_itl_morphic/vc9_labat_itl_morphic.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_itl_morphic/vc9_labat_itl_morphic.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/validate/example/labat_itl_order/vc9_labat_itl_order.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_itl_order/vc9_labat_itl_order.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_itl_order/vc9_labat_itl_order.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/validate/example/labat_itl_set/vc9_labat_itl_set.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_itl_set/vc9_labat_itl_set.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_itl_set/vc9_labat_itl_set.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/validate/example/labat_signed_quantifier/vc9_labat_signed_quantifier.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_signed_quantifier/vc9_labat_signed_quantifier.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_signed_quantifier/vc9_labat_signed_quantifier.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
Modified: sandbox/itl/libs/validate/example/labat_single/labat_single.cpp
==============================================================================
--- sandbox/itl/libs/validate/example/labat_single/labat_single.cpp (original)
+++ sandbox/itl/libs/validate/example/labat_single/labat_single.cpp 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -16,6 +16,8 @@
#include <boost/itl/map.hpp>
#include <boost/itl/interval_morphism.hpp>
#include <boost/validate/laws/induced_relation.hpp>
+#include <boost/validate/laws/symmetric_difference.hpp>
+#include <boost/validate/laws/pushouts.hpp>
#include <boost/validate/validater/law_validater.hpp>
#include <boost/validate/gentor/gentorprofile.hpp>
#include <boost/validate/gentor/rangegentor.hpp>
@@ -31,11 +33,9 @@
void test_LawValidater()
{
- //typedef BinaryPushout<itl::split_interval_map<int,double>, itl::map<int,double>, Interval::Atomize, inplace_plus>
- // Map_Atomize_Union_DiagramT;
- //LawValidater<Map_Atomize_Union_DiagramT, RandomGentor> map_atomize_plus_pushout;
- //map_atomize_plus_pushout.setTrialsCount(1000);
- //map_atomize_plus_pushout.run();
+ //typedef BinaryPushout<itl::split_interval_map<int,int,partial_enricher>, itl::map<int,int,partial_enricher>, Interval::Atomize, inplace_caret>
+ // TestLawT;
+ //LawValidater<TestLawT, RandomGentor> test_law;
//typedef BinaryPushout<itl::map<int,double>, itl::split_interval_map<int,double>, Interval::Cluster, inplace_et>
// Map_Cluster_Intersect_DiagramT;
@@ -43,22 +43,22 @@
//map_cluster_star_pushout.setTrialsCount(1000);
//map_cluster_star_pushout.run();
- //typedef InplaceFlip
- // <interval_map<int, nat> > TestLawT;
- //LawValidater<TestLawT, RandomGentor> test_law;
+ typedef InplaceFlip
+ <itl::interval_map<int, int, partial_enricher > > TestLawT;
+ LawValidater<TestLawT, RandomGentor> test_law;
//typedef InplaceAssociativity
// <itl::interval_map<int, int, partial_absorber>, inplace_et> TestLawT;
//LawValidater<TestLawT, RandomGentor> test_law;
- typedef InducedRelation
- <itl::interval_map<int, int, partial_enricher>,
- typename itl::interval_map<int, int, partial_enricher>::atomized_type,
- Interval::Atomize, protonic_equal> TestLawT;
- LawValidater<TestLawT, RandomGentor> test_law;
+ //typedef InducedRelation
+ // <itl::interval_map<int, int, partial_enricher>,
+ // typename itl::interval_map<int, int, partial_enricher>::atomized_type,
+ // Interval::Atomize, protonic_equal> TestLawT;
+ //LawValidater<TestLawT, RandomGentor> test_law;
//-----------------------------------------------------------------------------
- int test_count = 10000;
+ int test_count = 5000;
ptime start, stop;
test_law.setTrialsCount(test_count);
Modified: sandbox/itl/libs/validate/example/labat_unsigned_quantifier/vc9_labat_unsigned_quantifier.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_unsigned_quantifier/vc9_labat_unsigned_quantifier.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_unsigned_quantifier/vc9_labat_unsigned_quantifier.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
@@ -195,10 +196,6 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
- RelativePath="..\..\..\..\boost\validate\unsigned_quantifier_validater.hpp"
- >
- </File>
- <File
RelativePath="..\..\..\..\boost\validate\law.h"
>
</File>
@@ -230,6 +227,10 @@
RelativePath="..\..\..\..\boost\validate\typevalidater.h"
>
</File>
+ <File
+ RelativePath="..\..\..\..\boost\validate\unsigned_quantifier_validater.hpp"
+ >
+ </File>
</Filter>
<Filter
Name="Ressourcendateien"
Modified: sandbox/itl/libs/validate/example/labat_val_relations/vc9_labat_val_relations.vcproj
==============================================================================
--- sandbox/itl/libs/validate/example/labat_val_relations/vc9_labat_val_relations.vcproj (original)
+++ sandbox/itl/libs/validate/example/labat_val_relations/vc9_labat_val_relations.vcproj 2009-02-26 10:16:25 EST (Thu, 26 Feb 2009)
@@ -40,6 +40,7 @@
/>
<Tool
Name="VCCLCompilerTool"
+ AdditionalOptions="/bigobj"
Optimization="0"
AdditionalIncludeDirectories="../../../../; ../../../../boost_1_35_0"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
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