Olena

olena@lrde.epita.fr

325 discussions

by 241171＠mail.com

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: OEM Software URI:http://www.low-price-soft.biz/?241171 Specials good thru 11/12/03. Please use discount code mail9221 to receive these prices. Software: Windows XP Suites, Adobe software, Clearance, Corel Draw/Corel Ventura, Games, 3D Studio Max, Operating Systems, Utilities. [...] Content analysis details: (21.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.2 NO_REAL_NAME From: does not include a real name 2.7 ADDR_NUMS_AT_BIGSITE Uses an address with lots of numbers, at a big ISP 1.0 FROM_ENDS_IN_NUMS From: ends in numbers 0.6 FROM_STARTS_WITH_NUMS From: starts with nums 0.1 HTML_70_80 BODY: Message is 70% to 80% HTML 5.4 BAYES_99 BODY: Bayesian spam probability is 99 to 100% [score: 1.0000] 0.1 HTML_FONTCOLOR_UNKNOWN BODY: HTML font color is unknown to us 0.3 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.1 HTML_MESSAGE BODY: HTML included in message 0.3 HTML_FONT_BIG BODY: HTML has a big font 0.2 HTML_TAG_BALANCE_A BODY: HTML has excess "a" close tags 0.1 BIZ_TLD URI: Contains a URL in the BIZ top-level domain 2.0 DATE_IN_FUTURE_06_12 Date: is 6 to 12 hours after Received: date 0.7 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [<http://dsbl.org/listing?ip=218.155.54.94>] 1.5 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?218.155.54.94>] 1.7 FORGED_MUA_THEBAT Mail pretending to be from The Bat! (mid) 4.1 FORGED_THEBAT_HTML The Bat! can't send HTML message only 0.7 FROM_ALL_NUMS From an address that is all numbers (non-phone) The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

21 years, 4 months

*****SPAM***** Clearance 241058

by 241058＠delphi.com

------------------ Début de Rapport SpamAssassin --------------------- Ce message est probablement du SPAM. Cette notice a été ajoutée par le système d'analyse "SpamAssassin" sur le serveur "kualalumpur.lrde.epita.fr", pour vous aider à identifier ce type de messages. Le message original est ci-joint, pour que vous puissiez verifier que c'est vraiment du SPAM. Si vous avez des questions, posez les à the administrator of that system Contenu du message: OEM Software URI:http://www.low-price-soft.biz/?241058 Specials good thru 11/12/03. Please use discount code mail9221 to receive these prices. Software: Windows XP Suites, Adobe software, Clearance, Corel Draw/Corel Ventura, Games, 3D Studio Max, Operating Systems, Utilities. [...] Détails de l'analyse du message: (11.5 points, 5.0 requis) 0.3 NO_REAL_NAME Le champ From: ne contient pas le nom complet de l'expéditeur 0.7 ADDR_NUMS_AT_BIGSITE Utilise une adresse ayant de nombreux chiffres, chez un gros F.S.I. 0.9 FROM_ENDS_IN_NUMS L'en-tête From: se termine par un nombre 1.6 FROM_STARTS_WITH_NUMS L'en-tête From: commence par des chiffres 0.1 HTML_70_80 BODY: Le message est composé de 70 à 80% de HTML 0.2 HTML_TAG_BALANCE_TABLE BODY: Le tag de fermeture de table HTML est manquant 0.1 HTML_FONTCOLOR_UNKNOWN BODY: HTML font color is unknown to us 0.1 MIME_HTML_ONLY BODY: Le message possède uniquement des parties MIME text/html 0.0 HTML_MESSAGE BODY: HTML inclus dans le message 0.1 HTML_FONT_BIG BODY: Police de taille +2 ou 3 et davantage 0.1 HTML_TAG_BALANCE_A BODY: Tag de fermeture "a" HTML en excédent 0.8 BIZ_TLD URI: Contains a URL in the BIZ top-level domain 1.9 DATE_IN_FUTURE_06_12 Date: est 6 à 12 heures après la date de l'en-tête Received: 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [218.149.167.220 listed in dnsbl.sorbs.net] 1.1 RCVD_IN_DSBL RBL: Relais listé dans list.dsbl.org, voir http://dsbl.org [<http://dsbl.org/listing?ip=218.149.167.220>] 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Relais listé dans bl.spamcom.net, voir http://spamcop.net/bl.shtml [Blocked - see <http://www.spamcop.net/bl.shtml?218.149.167.220>] 1.2 FROM_ALL_NUMS Adresse "From" composée uniquement de chiffres (pas un No. de tél.) -------------------- Fin de Rapport SpamAssassin --------------------- Le message original n'étant pas au format text brut, il est peut-être dangereux de l'ouvrir avec votre logiciel e-mail ; en particulier il pourrait contenir un virus, ou confirmer que votre adresse e-mail peut recevoir des spams. Si vous souhaitez lire le message, il est conseillé de l'enregistrer, puis de le lire avec un éditeur de texte.

21 years, 5 months

Re: [Olena-bugs] tour program crashes

by Nicolas Burrus

On Friday 12 December 2003 16:47, Jean-Sebastien Mouret wrote: > Michal Lijowski <michal(a)cvu.wustl.edu> writes: >> >> [..] > > By the way, olena's io used to be more expressive. Applying the below > patch should prevent this kind of disappointment. I really don't know > why this line has been commented out, maybe because it is a bit > annoying when using olena in a python shell (as it may have its own > error reporting). Having Olena logging systematically on clog can disturb the normal output of the calling program (which may itself use clog for another reason). That's why I don't think uncontrolled verbosity should be kept. We should have something more sophisticated for debug, which can be parameterized by the calling program (levels of verbosity, stream on which log should be written, etc.). This is in the TODO list ... :) demo/tour.cc should check image loading success before continuing though, as one would have done with C++ streams, using the image::has_impl() method. Index: doc/demo/tour.cc --- doc/demo/tour.cc Tue, 13 May 2003 22:55:53 +0200 burrus_n (oln/ d/45_tour.cc 1.12 640) +++ doc/demo/tour.cc Fri, 12 Dec 2003 17:19:13 +0100 burrus_n (oln/ d/45_tour.cc 1.12 640) @@ -330,6 +330,11 @@ // the type of the image you load/save. The extension // is also used to guess the format to use. image2d<int_u8> lena = load(IMGDIR "/lena.pgm"); + if (!lena.has_impl()) + { + std::cerr << "Could not load " << IMGDIR "/lena.pgm" << std::endl; + exit(1); + } std::cout << "watershedling lena..." << std::endl; save(morpho::watershed_seg<int_u8>(lena, neighb_c4()), "output.pgm");

21 years, 5 months

[Fwd: [isis-all] Journée EDP du 15 janvier 2004]

by Thierry Géraud

sic

21 years, 5 months

Olena make check results

by Michal Lijowski

Hello, I compiled Olena 0.9 on Intel P4 RedHat Fedora with gcc 3.3.2 compiler. But I encountered the following errors when running make check. Before I compiled Olena I installed fftw-2.1.5 and both libraries librfftw.a and libfftw.a are located in /usr/local/directory. I did not disabled fft option when configuring Olena build. I appreciate your attention. Michal g++ -O3 -finline-limit-1500 -Wall -pedantic -Werror -lz -o multiple_sources -lz -lfftw -lrfftw multiple_sources-multiple_sources_1.o multiple_sources-multiple_sources_2.o ../check/libolncheck.a multiple_sources-multiple_sources_1.o(.text+0xab1): In function `first_check()':: undefined reference to `rfftw2d_create_plan' multiple_sources-multiple_sources_1.o(.text+0xb07): In function `first_check()':: undefined reference to `rfftw2d_create_plan' multiple_sources-multiple_sources_1.o(.text+0xbd0): In function `first_check()':: undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_1.o(.text+0xbdc): In function `first_check()':: undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_1.o(.text+0x13ad): In function `first_check()': : undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_1.o(.text+0x13b6): In function `first_check()': : undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_2.o(.text+0xab1): In function `second_check()': : undefined reference to `rfftw2d_create_plan' multiple_sources-multiple_sources_2.o(.text+0xb07): In function `second_check()': : undefined reference to `rfftw2d_create_plan' multiple_sources-multiple_sources_2.o(.text+0xbd0): In function `second_check()': : undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_2.o(.text+0xbdc): In function `second_check()': : undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_2.o(.text+0x13ad): In function `second_check()': : undefined reference to `fftwnd_destroy_plan' multiple_sources-multiple_sources_2.o(.text+0x13b6): In function `second_check()': : undefined reference to `fftwnd_destroy_plan'

21 years, 5 months

10.46: (doc): add uml hierarchies

by hogur

2003-12-08 David Lesage <david(a)lrde.epita.fr> Add Dia UML hierarchies. * hierarchies/, * hierarchies/structelt.dia, * hierarchies/point.dia, * hierarchies/new_olena_model.dia, * hierarchies/misc.dia, * hierarchies/labels.dia, * hierarchies/iter.dia, * hierarchies/implementation.dia: New. Pas de diff, c'est du binaire :/. Dia est le meilleur outil que j'aie trouve, mais j'hesite a faire un Makefile pour generer les eps et pdf a partir des dia. En effet, cela nous rendrait dependant de Dia, et, qui plus est, nous obligerait a faire nos distcheck en X (dia, pour s'initialiser, necessite des trucs GTK. Meme pour exporter un fichier...). Donc, en attente d'une solution propre. Pour une version visible: ~david/work/olena/olena_doc/*.{eps,pdf} -- hogur

21 years, 5 months

*****SPAM***** Discount code 240930

by 240930＠delphi.com

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or block similar future email. If you have any questions, see the administrator of that system for details. Content preview: OEM Software URI:http://www.oem-biz.biz/?240930 Specials good thru 11/12/03. Please use discount code mail9221 to receive these prices. Software: Windows XP Suites, Adobe software, Clearance, Corel Draw/Corel Ventura, Games, 3D Studio Max, Operating Systems, Utilities. [...] Content analysis details: (13.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.3 NO_REAL_NAME From: does not include a real name 0.7 ADDR_NUMS_AT_BIGSITE Uses an address with lots of numbers, at a big ISP 0.9 FROM_ENDS_IN_NUMS From: ends in numbers 1.6 FROM_STARTS_WITH_NUMS From: starts with nums 0.1 HTML_70_80 BODY: Message is 70% to 80% HTML 0.2 HTML_TAG_BALANCE_TABLE BODY: HTML is missing "table" close tags 0.1 HTML_FONTCOLOR_UNKNOWN BODY: HTML font color is unknown to us 0.1 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 HTML_FONT_BIG BODY: HTML has a big font 0.1 HTML_TAG_BALANCE_A BODY: HTML has excess "a" close tags 0.8 BIZ_TLD URI: Contains a URL in the BIZ top-level domain 1.9 DATE_IN_FUTURE_06_12 Date: is 6 to 12 hours after Received: date 0.1 RCVD_IN_SORBS RBL: SORBS: sender is listed in SORBS [12.229.244.46 listed in dnsbl.sorbs.net] 2.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?12.229.244.46>] 2.7 FORGED_MUA_OIMO Forged mail pretending to be from MS Outlook IMO 1.2 FROM_ALL_NUMS From an address that is all numbers (non-phone) The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

21 years, 5 months

exiftags

by Akim Demaille

http://johnst.org/sw/exiftags/ Description The exiftags utility parses a specified JPEG file or, by default, its standard input, looking for a JPEG APP1 section containing Exif (Exchangeable Image File) image metadata. The properties contained in these data are then printed to the standard output. Digital cameras typically add Exif data to the image files they produce, containing information about the camera and digitized image. The program supports a variety of cameras, and includes additional support for a portion of the maker notes for Canon, Casio, Fuji, Minolta, Nikon, Olympus, and Sanyo cameras. Currently this program runs under Windows and Unix-like operating systems. An included companion utility, exifcom, displays and writes the UserComment Exif tag that some cameras include in the image metadata they create. This program is useful for recording caption or location information in the image file itself.

21 years, 5 months

10.45: (intègre): Avoid useless dynamic checks in arithmetic operations.

by Nicolas Burrus

int_u6 = int_u8 + int_u8 est safe au niveau de l'opération arithmétique, seul l'affectation à besoin d'être checkée. int_u6 = int_u32 + int_u8 n'est pas safe au niveau arithmétique, ie. il ne suffit pas de faire l'opération puis de vérifier l'affectation. (int + int => int en C/C++). Ce patch permet de déterminer avec plus de précision les cas où un check dynamique est requis. Index: integre/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> * tests/types/tests/int_u8: New test. * tests/types/runtests: Rename KEEP_RUN as KEEP_RUNS. +2003-11-27 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + + * ntg/real/behavior.hh: Check arithmetic operators, not arithmetic + assignment operators. + (force): New behavior. + (ret_behavior_if): New helper struct. + + * ntg/core/value.hh: Define unsafe_type. + * ntg/core/macros.hh (ntg_unsafe_type): New macro. + * ntg/utils/cast.hh: Use ntg_unsafe_type. + + * ntg/real/typetraits_builtin_int.hh: Define abstract_behavior_type. + * ntg/real/builtin_float.hh: Likewise. + * ntg/real/range.hh: Likewise. + * ntg/real/cycle.hh: Likewise. + + * ntg/real/int_s.hh: Remove useless arithmetic operations + checks. Define need_check for operation traits. + * ntg/real/int_u.hh: Likewise. + + * ntg/real/optraits_real_defs.hh: Derive arithmetic assignment + operators from arithmetic operators. Use the behavior given by the + operator traits instead of the behavior of the return type. + * ntg/real/optraits_real.hh: Adjust consequently. + +2003-11-27 Nicolas Burrus <burrus_n(a)lrde.epita.fr> + Make typetraits and optraits reproduce more accurately the value hierarchy. Index: integre/ntg/real/behavior.hh --- integre/ntg/real/behavior.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/31_behaviour. 1.13.1.16 640) +++ integre/ntg/real/behavior.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/31_behaviour. 1.13.1.15.1.1 640) @@ -29,7 +29,7 @@ # define NTG_REAL_BEHAVIOUR_HH /* - Behaviors for data_types int_u, int_s, etc ... + Behaviors for real datatypes int_u, int_s, etc ... <WARNING> Don't forget that behaviors are checked on assignements and contruction of types, and use comparison, so create only vars @@ -53,10 +53,10 @@ # include <string> # include <sstream> - // FIXME: there is maybe simpler a way to write that, but we want it // to be compatible with icc, so the behaviors must stay classes, not // meta classes. +// FIXME: are these considerations still accurate? namespace ntg { @@ -86,28 +86,28 @@ template <class T1, class T2> static T - check_plus_equal (T1 lhs, T2 rhs) + check_plus (T1 lhs, T2 rhs) { return lhs + rhs; } template <class T1, class T2> static T - check_minus_equal (T1 lhs, T2 rhs) + check_minus (T1 lhs, T2 rhs) { return lhs - rhs; } template <class T1, class T2> static T - check_times_equal (T1 lhs, T2 rhs) + check_times (T1 lhs, T2 rhs) { return lhs * rhs; } template <class T1, class T2> static T - check_div_equal (T1 lhs, T2 rhs) + check_div (T1 lhs, T2 rhs) { return lhs / rhs; } template <class P> static storage_type check (const P& p) - { return static_cast<storage_type>(p); } + { return p; } }; static std::string @@ -115,6 +115,63 @@ { return "unsafe"; } }; + /*------. + | force | + `------*/ + //! Force the value to be assigned without checks. + /*! + Quite similar to unsafe, but even if the destination type has a + strict behavior, by using cast::force we ensure that no check will + be performed. + + Example: + + int_u<8, strict> a; + a = force::get<int_u<8, strict> >::check_plus(5, 6); + + => no check + + This construction is useful when we want to use code from a + particular behavior to a type defined with another behavior. + */ + struct force + { + template <class T> + struct get + { + typedef ntgi_storage_type(T) storage_type; + + template <class T1, class T2> + static T + check_plus (T1 lhs, T2 rhs) + { return cast::force<T>(lhs + rhs); } + + template <class T1, class T2> + static T + check_minus (T1 lhs, T2 rhs) + { return cast::force<T>(lhs - rhs); } + + template <class T1, class T2> + static T + check_times (T1 lhs, T2 rhs) + { return cast::force<T>(lhs * rhs); } + + template <class T1, class T2> + static T + check_div (T1 lhs, T2 rhs) + { return cast::force<T>(lhs / rhs); } + + template <class P> + static storage_type + check (const P& p) + { return cast::force<T>(p); } + }; + + static std::string + name() + { return "force"; } + }; + /*-------. | strict | `-------*/ @@ -136,7 +193,7 @@ template <class T1, class T2> static T - check_plus_equal (T1 lhs, T2 rhs) + check_plus (T1 lhs, T2 rhs) { T ret = lhs + rhs; if (rhs > 0) @@ -148,7 +205,7 @@ template <class T1, class T2> static T - check_minus_equal (T1 lhs, T2 rhs) + check_minus (T1 lhs, T2 rhs) { T ret = lhs - rhs; if (rhs > 0) @@ -161,7 +218,7 @@ // FIXME: this check is very slow! Find another solution. template <class T1, class T2> static T - check_times_equal (T1 lhs, T2 rhs) + check_times (T1 lhs, T2 rhs) { T ret = lhs * rhs; if (rhs != 0) @@ -171,7 +228,7 @@ template <class T1, class T2> static T - check_div_equal (T1 lhs, T2 rhs) + check_div (T1 lhs, T2 rhs) { return lhs / rhs; } template <class P> @@ -203,7 +260,7 @@ template <class T1, class T2> static T - check_plus_equal (T1 lhs, T2 rhs) + check_plus (T1 lhs, T2 rhs) { T ret = lhs + rhs; if (rhs > 0) @@ -218,7 +275,7 @@ template <class T1, class T2> static T - check_minus_equal (T1 lhs, T2 rhs) + check_minus (T1 lhs, T2 rhs) { T ret = lhs - rhs; if (rhs > 0) @@ -234,7 +291,7 @@ // FIXME: this check is very slow ! find another solution ... template <class T1, class T2> static T - check_times_equal (T1 lhs, T2 rhs) + check_times (T1 lhs, T2 rhs) { T ret = lhs * rhs; if ((ret / rhs) != lhs) @@ -250,7 +307,7 @@ template <class T1, class T2> static T - check_div_equal (T1 lhs, T2 rhs) + check_div (T1 lhs, T2 rhs) { return lhs / rhs; } template <class P> @@ -292,19 +349,19 @@ // FIXME: calculate real values! template <class T1, class T2> - static T check_plus_equal (T1 lhs, T2 rhs) + static T check_plus (T1 lhs, T2 rhs) { return lhs + rhs; } template <class T1, class T2> - static T check_minus_equal (T1 lhs, T2 rhs) + static T check_minus (T1 lhs, T2 rhs) { return lhs - rhs; } template <class T1, class T2> - static T check_times_equal (T1 lhs, T2 rhs) + static T check_times (T1 lhs, T2 rhs) { return lhs * rhs; } template <class T1, class T2> - static T check_div_equal (T1 lhs, T2 rhs) + static T check_div (T1 lhs, T2 rhs) { return lhs / rhs; } // float modulus @@ -372,6 +429,32 @@ struct deduce_op_behavior<B, B> { typedef B ret; }; + /*----------------. + | ret_behavior_if | + `----------------*/ + + //! Determine the behavior to use depending on check requirements. + /*! + If need_check is true, the returned behavior will be the same as + the previously determined return type (generally safe). + + In some cases, no check is required, thus type used to perform + the calculus does not need to be safe. The force behavior is + returned in such cases. + */ + + template <bool need_check, class Ret> + struct ret_behavior_if + { + typedef typename typetraits<Ret>::abstract_behavior_type ret; + }; + + template <class Ret> + struct ret_behavior_if<false, Ret> + { + typedef ntg::force ret; + }; + } // end of internal. } // end of ntg. Index: integre/ntg/utils/cast.hh --- integre/ntg/utils/cast.hh Fri, 07 Nov 2003 17:26:19 +0100 burrus_n (oln/i/26_cast.hh 1.3.1.10 640) +++ integre/ntg/utils/cast.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/i/26_cast.hh 1.3.1.11 640) @@ -74,7 +74,7 @@ const Tdest force(const Tsrc& val) { - Tdest tmp(static_cast<ntg_storage_type(Tdest)>(val)); + ntg_unsafe_type(Tdest) tmp (val); return tmp; } Index: integre/ntg/real/int_s.hh --- integre/ntg/real/int_s.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.18 640) +++ integre/ntg/real/int_s.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.16.1.1 640) @@ -46,17 +46,41 @@ // FIXME: add bits number comparison to avoid useless checks. -# define INT_S_CTOR_FROM_BUILTIN(Builtin) \ +# define INT_S_CTOR_FROM_UNSIGNED_BUILTIN(Builtin) \ int_s (const Builtin rhs) \ { \ + if ((unsigned) internal::typetraits<ntg_type(Builtin)>::size < nbits) \ + this->val_ = rhs; \ + else \ this->val_ = optraits_type::check(rhs); \ } \ self& operator=(const Builtin rhs) \ { \ + if ((unsigned) internal::typetraits<ntg_type(Builtin)>::size < nbits) \ + this->val_ = rhs; \ + else \ this->val_ = optraits_type::check(rhs); \ return *this; \ } +# define INT_S_CTOR_FROM_SIGNED_BUILTIN(Builtin) \ +int_s (const Builtin rhs) \ +{ \ + if ((unsigned)internal::typetraits<ntg_type(Builtin)>::size <= nbits) \ + this->val_ = rhs; \ + else \ + this->val_ = optraits_type::check(rhs); \ +} \ +self& operator=(const Builtin rhs) \ +{ \ + if ((unsigned)internal::typetraits<ntg_type(Builtin)>::size <= nbits) \ + this->val_ = rhs; \ + else \ + this->val_ = optraits_type::check(rhs); \ + return *this; \ +} + + namespace ntg { namespace internal { @@ -76,6 +100,7 @@ ntg_build_value_type(sint_value<E>); typedef optraits<self> optraits_type; + typedef behavior abstract_behavior_type; typedef typename behavior::template get<self> behavior_type; typedef self base_type; @@ -90,6 +115,9 @@ typedef int_u<32, behavior> unsigned_largest_type; typedef int_u<32, behavior> unsigned_cumul_type; typedef signed int integer_type; + + // Particular properties + enum { size = nbits }; }; } // end of internal. @@ -112,18 +140,18 @@ // We define ctor for each builtin to avoid implicit builtin // promotion. - INT_S_CTOR_FROM_BUILTIN(unsigned long); - INT_S_CTOR_FROM_BUILTIN(signed long); + INT_S_CTOR_FROM_UNSIGNED_BUILTIN(unsigned long); + INT_S_CTOR_FROM_SIGNED_BUILTIN(signed long); - INT_S_CTOR_FROM_BUILTIN(unsigned int); - INT_S_CTOR_FROM_BUILTIN(signed int); + INT_S_CTOR_FROM_UNSIGNED_BUILTIN(unsigned int); + INT_S_CTOR_FROM_SIGNED_BUILTIN(signed int); - INT_S_CTOR_FROM_BUILTIN(unsigned short); - INT_S_CTOR_FROM_BUILTIN(signed short); + INT_S_CTOR_FROM_UNSIGNED_BUILTIN(unsigned short); + INT_S_CTOR_FROM_SIGNED_BUILTIN(signed short); - INT_S_CTOR_FROM_BUILTIN(unsigned char); - INT_S_CTOR_FROM_BUILTIN(signed char); - INT_S_CTOR_FROM_BUILTIN(char); + INT_S_CTOR_FROM_UNSIGNED_BUILTIN(unsigned char); + INT_S_CTOR_FROM_SIGNED_BUILTIN(signed char); + INT_S_CTOR_FROM_SIGNED_BUILTIN(char); template <unsigned mbits, class B2> int_s (const int_s<mbits, B2>& rhs) @@ -306,7 +334,8 @@ // debug static std::string name() { std::ostringstream out; - out << "int_s<" << int(nbits) << ", " << behavior::name() << ">"<< std::ends; + out << "int_s<" << int(nbits) << ", " << behavior::name() << ">" + << std::ends; return out.str(); } }; @@ -325,10 +354,12 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_plus, int_s<nbits, B1>, int_s<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((unsigned) mlc::max<nbits, mbits>::ret >= 32) }; typedef int_s<(unsigned)mlc::maxN<nbits + 1,mbits + 1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; @@ -337,10 +368,12 @@ template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_plus, int_s<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((mbits >= 31) || (nbits >= 32)) }; typedef int_s<(unsigned)mlc::maxN<nbits + 1,mbits + 2, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; @@ -353,10 +386,12 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_minus, int_s<nbits, B1>, int_s<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((mbits >= 31) || (nbits >= 31)) }; typedef int_s<(unsigned)mlc::maxN<nbits + 1, mbits + 1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // int_s - int_u ; int_u - int_s @@ -364,10 +399,12 @@ template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_minus, int_s<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((mbits >= 31) || (nbits >= 32)) }; typedef int_s<(unsigned)mlc::maxN<nbits + 1, mbits + 2, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; @@ -380,10 +417,12 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_times, int_s<nbits, B1>, int_s<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = (mbits + nbits > 32) }; typedef int_s<(unsigned)mlc::saturateN<nbits + mbits, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; @@ -392,10 +431,12 @@ template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_times, int_s<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = (nbits + mbits + 1 > 32)}; typedef int_s<(unsigned)mlc::saturateN<nbits + mbits+1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // @@ -409,7 +450,7 @@ { enum { commutative = true }; typedef int_s<nbits, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; // int_s / int_u ; int_u / int_s @@ -417,18 +458,22 @@ template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_div, int_s<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = false }; + enum { commutative = false, + need_check = (mbits >= 32) }; typedef int_s<nbits, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_div, int_u<mbits, B2>, int_s<nbits, B1> > { - enum { commutative = false }; + enum { commutative = false, + need_check = (mbits >= 32) }; typedef int_s<mlc::saturateN<mbits + 1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // @@ -442,7 +487,7 @@ { enum { commutative = false }; typedef int_s<mbits, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; // int_s % int_u ; int_u % int_s @@ -450,12 +495,19 @@ template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_mod, int_s<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = false }; + enum { commutative = false, + need_check = (mbits >= 32) }; typedef int_s<(unsigned)mlc::saturateN<mbits + 1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; + // FIXME: don't know what to do with this operator, so the + // implementation is disabled. In classical C++, (a % b) with b < 0 + // returns a whatever b is. + +#if 0 template <unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_mod, int_u<nbits, B1>, int_s<mbits, B2> > { @@ -463,7 +515,7 @@ typedef int_u<mbits, typename deduce_op_behavior<B1, B2>::ret> ret; typedef int_s<nbits, B1> impl; }; - +#endif // // Min @@ -477,7 +529,7 @@ enum { commutative = true }; typedef int_s<(unsigned) mlc::min<nbits, mbits>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; // @@ -492,7 +544,7 @@ enum { commutative = true }; typedef int_s<(unsigned) mlc::max<nbits, mbits>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; // @@ -506,7 +558,7 @@ { enum { commutative = true }; typedef int_s<(unsigned)mlc::maxN<nbits,mbits,32>::ret, unsafe> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; @@ -517,7 +569,7 @@ { enum { commutative = true }; typedef int_s<(unsigned)mlc::maxN<nbits,mbits+1, 32>::ret, unsafe> ret; - typedef int_s<nbits, B1> impl; + typedef int_s<nbits, force> impl; }; } // end of internal. Index: integre/ntg/real/int_u.hh --- integre/ntg/real/int_u.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.18 640) +++ integre/ntg/real/int_u.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.16.1.1 640) @@ -42,6 +42,23 @@ | macros | `-------*/ +# define INT_U_CTOR_FROM_UNSIGNED_BUILTIN_INT(Builtin) \ +int_u (const Builtin rhs) \ +{ \ + if ((unsigned) internal::typetraits<ntg_type(Builtin)>::size <= nbits) \ + this->val_ = rhs; \ + else \ + this->val_ = optraits_type::check(rhs); \ +} \ +self& operator=(const Builtin rhs) \ +{ \ + if ((unsigned) internal::typetraits<ntg_type(Builtin)>::size <= nbits) \ + this->val_ = rhs; \ + else \ + this->val_ = optraits_type::check(rhs); \ + return *this; \ +} + # define INT_U_CTOR_FROM_BUILTIN_INT(Builtin) \ int_u (const Builtin rhs) \ { \ @@ -53,6 +70,7 @@ return *this; \ } + namespace ntg { namespace internal { @@ -72,9 +90,9 @@ ntg_build_value_type(uint_value<E>); typedef optraits<self> optraits_type; + typedef behavior abstract_behavior_type; typedef typename behavior::template get<self> behavior_type; - typedef self base_type; typedef typename C_for_int_u<nbits>::type storage_type; typedef int_s<mlc::saturateN<nbits+1, 32>::ret, @@ -88,6 +106,10 @@ typedef int_u<32, behavior> unsigned_largest_type; typedef int_u<32, behavior> unsigned_cumul_type; typedef unsigned int integer_type; + typedef int_u<nbits, unsafe> unsafe_type; + + // Particular properties + enum { size = nbits }; }; } // end of internal. @@ -111,16 +133,18 @@ // We define ctor for each builtin to avoid implicit builtin // promotion. - INT_U_CTOR_FROM_BUILTIN_INT(unsigned long); + // FIXME: dynamic checks are not necessary for all builtin types! + + INT_U_CTOR_FROM_UNSIGNED_BUILTIN_INT(unsigned long); INT_U_CTOR_FROM_BUILTIN_INT(signed long); - INT_U_CTOR_FROM_BUILTIN_INT(unsigned int); + INT_U_CTOR_FROM_UNSIGNED_BUILTIN_INT(unsigned int); INT_U_CTOR_FROM_BUILTIN_INT(signed int); - INT_U_CTOR_FROM_BUILTIN_INT(unsigned short); + INT_U_CTOR_FROM_UNSIGNED_BUILTIN_INT(unsigned short); INT_U_CTOR_FROM_BUILTIN_INT(signed short); - INT_U_CTOR_FROM_BUILTIN_INT(unsigned char); + INT_U_CTOR_FROM_UNSIGNED_BUILTIN_INT(unsigned char); INT_U_CTOR_FROM_BUILTIN_INT(signed char); INT_U_CTOR_FROM_BUILTIN_INT(char); @@ -252,10 +276,12 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_plus, int_u<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((unsigned) mlc::max<nbits, mbits>::ret >= 32) }; typedef int_u<(unsigned) mlc::maxN<nbits + 1, mbits + 1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // @@ -267,10 +293,12 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_minus, int_u<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, + need_check = ((unsigned) mlc::max<nbits, mbits>::ret >= 32) }; typedef int_s<(unsigned) mlc::maxN<nbits+1, mbits+1, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // int_u32 - int_u : we do not convert result to int_s because we @@ -281,7 +309,7 @@ { enum { commutative = true }; typedef int_u<32, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<32, B1> impl; + typedef int_u<32, force> impl; }; // @@ -293,10 +321,11 @@ template<unsigned nbits, class B1, unsigned mbits, class B2> struct operator_traits<operator_times, int_u<nbits, B1>, int_u<mbits, B2> > { - enum { commutative = true }; + enum { commutative = true, need_check = (nbits + mbits > 32) }; typedef int_u<(unsigned) mlc::saturateN<nbits + mbits, 32>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, + typename ret_behavior_if<need_check, ret>::ret> impl; }; // @@ -310,7 +339,7 @@ { enum { commutative = true }; typedef int_u<nbits, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, force> impl; }; // @@ -324,7 +353,7 @@ { enum { commutative = false }; typedef int_u<mbits, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, force> impl; }; // @@ -339,7 +368,7 @@ enum { commutative = true }; typedef int_u<(unsigned) mlc::min<nbits, mbits>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, force> impl; }; @@ -355,7 +384,7 @@ enum { commutative = true }; typedef int_u<(unsigned) mlc::max<nbits, mbits>::ret, typename deduce_op_behavior<B1, B2>::ret> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, force> impl; }; @@ -369,8 +398,9 @@ struct operator_traits<operator_cmp, int_u<nbits, B1>, int_u<mbits, B2> > { enum { commutative = true }; + // FIXME: why unsafe? I think there is a reason. typedef int_u<(unsigned) mlc::maxN<nbits, mbits, 32>::ret, unsafe> ret; - typedef int_u<nbits, B1> impl; + typedef int_u<nbits, force> impl; }; } // end of internal. Index: integre/ntg/real/optraits_real_defs.hh --- integre/ntg/real/optraits_real_defs.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/11_optraits_s 1.15 640) +++ integre/ntg/real/optraits_real_defs.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/11_optraits_s 1.14.1.1 640) @@ -29,23 +29,23 @@ # define NTG_OPTRAITS_REAL_DEFS_HH // -// macros used in optraits_scalar definition +// macros used in optraits_real definition // ///////////////////////////////////////////// -# define ASSIGN_SCALAR_OPERATOR(Name, Op) \ +# define ASSIGN_SCALAR_OPERATOR(Name) \ template <class T1, class T2> inline \ - static T1& Name(T1& lhs, const T2& rhs) \ + static T1& Name##_equal(T1& lhs, const T2& rhs) \ { \ ntg_is_a(T1, ntg::real)::ensure(); \ ntg_is_a(T2, ntg::real)::ensure(); \ \ - return Name##_impl<T1,T2>(lhs, rhs); \ + return Name##_equal_impl<T1,T2>(lhs, rhs); \ } \ \ template <class T1, class T2> inline \ static T1& \ - Name##_impl(ntg::real_value<T1>& lhs, \ + Name##_equal_impl(ntg::real_value<T1>& lhs, \ const ntg::real_value<T2>& rhs) \ { \ typedef typename typetraits<T1>::behavior_type behavior_type; \ @@ -56,7 +56,7 @@ \ template <class T1, class T2> inline \ static T1& \ - Name##_impl(ntg::real_value<T1>& lhs, \ + Name##_equal_impl(ntg::real_value<T1>& lhs, \ const ntg::any_const_class<T2> rhs) \ { \ typedef typename typetraits<T1>::behavior_type behavior_type; \ @@ -67,7 +67,7 @@ \ template <class T1, class T2> inline \ static T1& \ - Name##_impl(ntg::any_class<T1> lhs, \ + Name##_equal_impl(ntg::any_class<T1> lhs, \ const ntg::real_value<T2>& rhs) \ { \ typedef typename typetraits<T1>::behavior_type behavior_type; \ @@ -76,7 +76,7 @@ return lhs.exact(); \ } -# define ARITH_SCALAR_OPERATOR(Name, Op) \ +# define ARITH_SCALAR_OPERATOR(Name) \ template <class T1, class T2> inline \ static ntg_return_type(Name, T1, T2) \ Name(const T1& lhs, const T2& rhs) \ @@ -84,13 +84,54 @@ ntg_is_a(T1, ntg::real)::ensure(); \ ntg_is_a(T2, ntg::real)::ensure(); \ \ + return Name##_impl<T1,T2>(lhs, rhs); \ + } \ + \ + template <class T1, class T2> inline \ + static ntg_return_type(Name, T1, T2) \ + Name##_impl(const ntg::real_value<T1>& lhs, \ + const ntg::real_value<T2>& rhs) \ + { \ typedef ntg_return_type(Name, T1, T2) return_type; \ - return_type result(lhs); \ - result Op rhs; \ - return result; \ + typedef typename \ + typetraits<E>::abstract_behavior_type::get<return_type> \ + behavior_type; \ + return_type tmp; \ + tmp = behavior_type::check_##Name(lhs.exact().val(), \ + rhs.exact().val()); \ + return tmp; \ + } \ + \ + template <class T1, class T2> inline \ + static ntg_return_type(Name, T1, T2) \ + Name##_impl(const ntg::real_value<T1>& lhs, \ + const ntg::any_const_class<T2>& rhs) \ + { \ + typedef ntg_return_type(Name, T1, T2) return_type; \ + typedef typename \ + typetraits<E>::abstract_behavior_type::get<return_type> \ + behavior_type; \ + return_type tmp; \ + tmp = behavior_type::check_##Name(lhs.exact().val(), \ + rhs.exact()); \ + return tmp; \ + } \ + \ + template <class T1, class T2> inline \ + static ntg_return_type(Name, T1, T2) \ + Name##_impl(const ntg::any_const_class<T1>& lhs, \ + const ntg::real_value<T2>& rhs) \ + { \ + typedef ntg_return_type(Name, T1, T2) return_type; \ + typedef typename \ + typetraits<E>::abstract_behavior_type::get<return_type> \ + behavior_type; \ + return_type tmp; \ + tmp = behavior_type::check_##Name(lhs.exact(), \ + rhs.exact().val()); \ + return tmp; \ } - # define CMP_SCALAR_OPERATOR(Name, Op) \ template <class T1, class T2> inline \ static bool Name (const T1& lhs, const T2& rhs) \ @@ -105,7 +146,8 @@ } \ \ template <class T> inline \ - static bool Name##_impl(const ntg::real_value<T>& lhs, \ + static bool \ + Name##_impl(const ntg::real_value<T>& lhs, \ const ntg::real_value<T>& rhs) \ { return lhs.exact().val() Op rhs.exact().val(); } \ \ @@ -121,7 +163,6 @@ // //////////////////////////// - # define ASSIGN_INT_OPERATOR(Name, Op) \ template <class T1, class T2> inline \ static T1& Name(T1& lhs, const T2& rhs) \ Index: integre/ntg/real/optraits_real.hh --- integre/ntg/real/optraits_real.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.10 640) +++ integre/ntg/real/optraits_real.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.8.1.1 640) @@ -65,27 +65,26 @@ static storage_type_ default_val() { return zero(); } // - // dev note : the goal in those default operators is to check the kind + // dev note : the aim of these default operators is to check the kind // of operands (value or not), and then call the good function. // // ASSIGN_SCALAR_OPERATOR includes default check_xxx_equal functions // - ASSIGN_SCALAR_OPERATOR(plus_equal, +) - ASSIGN_SCALAR_OPERATOR(minus_equal, -) - ASSIGN_SCALAR_OPERATOR(times_equal, *) - ASSIGN_SCALAR_OPERATOR(div_equal, /) - - ARITH_SCALAR_OPERATOR(plus, +=) - ARITH_SCALAR_OPERATOR(minus, -=) - ARITH_SCALAR_OPERATOR(times, *=) - ARITH_SCALAR_OPERATOR(div, /=) + ASSIGN_SCALAR_OPERATOR(plus) + ASSIGN_SCALAR_OPERATOR(minus) + ASSIGN_SCALAR_OPERATOR(times) + ASSIGN_SCALAR_OPERATOR(div) + + ARITH_SCALAR_OPERATOR(plus) + ARITH_SCALAR_OPERATOR(minus) + ARITH_SCALAR_OPERATOR(times) + ARITH_SCALAR_OPERATOR(div) CMP_SCALAR_OPERATOR(cmp_eq, ==) CMP_SCALAR_OPERATOR(cmp_lt, <) }; - /*----------------------. | optraits<float_value> | `----------------------*/ Index: integre/ntg/core/value.hh --- integre/ntg/core/value.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/8_rec_value. 1.8.1.9 640) +++ integre/ntg/core/value.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/8_rec_value. 1.8.1.8.1.1 640) @@ -107,7 +107,9 @@ template <class E> struct typetraits<value<E> > - {}; + { + typedef E unsafe_type; + }; template <class E> struct optraits<value<E> > Index: integre/ntg/real/typetraits_builtin_int.hh --- integre/ntg/real/typetraits_builtin_int.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/3_typetraits 1.7.1.13 640) +++ integre/ntg/real/typetraits_builtin_int.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/g/3_typetraits 1.7.1.11.1.1 640) @@ -51,6 +51,7 @@ \ typedef optraits<self> optraits; \ typedef unsafe::get<self> behavior_type; \ + typedef unsafe abstract_behavior_type; \ \ typedef self base_type; \ typedef self storage_type; \ Index: integre/tests/types/runtests --- integre/tests/types/runtests Fri, 01 Aug 2003 11:42:33 +0200 burrus_n (oln/h/3_runtests 1.14.1.6 750) +++ integre/tests/types/runtests Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/h/3_runtests 1.14.1.7 750) @@ -93,7 +93,7 @@ msg=""; case $expected:$estatus in ok:0 | compfail:50 | abort:134) - if test ! x"$KEEP_RUN" = x"1"; then + if test ! x"$KEEP_RUNS" = x"1"; then rm -rf "$dir"; fi msg="(ok)" ;; Index: integre/ntg/core/macros.hh --- integre/ntg/core/macros.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/s/19_macros.hh 1.7 640) +++ integre/ntg/core/macros.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/s/19_macros.hh 1.8 640) @@ -92,6 +92,9 @@ # define ntg_comp_type_(T) \ ntg::type_traits<T>::comp_type +# define ntg_unsafe_type(T) typename ntg::type_traits<T>::unsafe_type +# define ntg_unsafe_type_(T) ntg::type_traits<T>::unsafe_type + /*-----------------. | values accessors | `-----------------*/ Index: integre/ntg/real/builtin_float.hh --- integre/ntg/real/builtin_float.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/47_builtin_fl 1.4 640) +++ integre/ntg/real/builtin_float.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/s/47_builtin_fl 1.2.1.1 640) @@ -57,6 +57,7 @@ typedef optraits<self> optraits_type; typedef unsafe::get<self> behavior_type; + typedef unsafe abstract_behavior_type; typedef self base_type; typedef self storage_type; @@ -86,6 +87,7 @@ typedef optraits<self> optraits_type; typedef unsafe::get<self> behavior_type; + typedef unsafe abstract_behavior_type; typedef self base_type; typedef self storage_type; Index: integre/ntg/real/range.hh --- integre/ntg/real/range.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/16_range.hh 1.5 640) +++ integre/ntg/real/range.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/t/16_range.hh 1.3.1.1 640) @@ -53,6 +53,7 @@ typedef self ntg_type; typedef optraits<self> optraits_type; typedef typename behavior::template get<self> behavior_type; + typedef behavior abstract_behavior_type; typedef ntgi_base_type(T) base_type; typedef T storage_type; Index: integre/ntg/real/cycle.hh --- integre/ntg/real/cycle.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/17_cycle.hh 1.3 640) +++ integre/ntg/real/cycle.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/t/17_cycle.hh 1.2.1.1 640) @@ -53,6 +53,7 @@ typedef self ntg_type; typedef optraits<self> optraits_type; typedef cycle_behavior::get<self> behavior_type; + typedef cycle_behavior abstract_behavior_type; typedef typename typetraits<T>::base_type base_type; typedef T storage_type; Index: integre/tests/types/tests/int_u8 --- integre/tests/types/tests/int_u8 Thu, 27 Nov 2003 11:45:11 +0100 burrus_n () +++ integre/tests/types/tests/int_u8 Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/w/6_int_u8 1.1 640) @@ -0,0 +1,9 @@ +int_u8 u1 = (unsigned char) 56; +int_u8 u2 = (unsigned char) 153; +int_u32 u = 0U; + +for (unsigned i = 0; i < 5000000; ++i) + for (unsigned j = 0; j < 10; ++j) + u = u1 * u2 + int_u8u(i % 50); + +return u != 8617;

21 years, 5 months

10.44: (intègre): reproduce more accurately the value hierarchy for traits

by Nicolas Burrus

Index: integre/ChangeLog from Nicolas Burrus <burrus_n(a)lrde.epita.fr> Make typetraits and optraits reproduce more accurately the value hierarchy. * ntg/real/int_s.hh: Fix traits inheritance. * ntg/real/int_u.hh: Likewise. * ntg/real/optraits_builtin_int.hh: Likewise. * ntg/real/typetraits_builtin_int.hh: Likewise. * ntg/real/builtin_float.hh: Likewise. * ntg/real/range.hh: Likewise. * ntg/real/cycle.hh: Likewise. * ntg/vect/vec.hh: Likewise. * ntg/enum/bin.hh: Likewise. * ntg/real/real_value.hh: Define typetraits. * ntg/vect/vect_value.hh: Likewise. * ntg/enum/enum_value.hh: Likewise. * ntg/real/optraits_real.hh: Rename optraits_xxx as optraits<xxx_value>. * ntg/core/value.hh: Define typetraits<value> and optraits<value>. * ntg/core/internal/traits.hh: Remove useless optraits_xxx definitions. Index: integre/ntg/real/int_s.hh --- integre/ntg/real/int_s.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.17 640) +++ integre/ntg/real/int_s.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/24_int_s.hh 1.16.1.18 640) @@ -67,6 +67,7 @@ template <unsigned nbits, class behavior> struct typetraits<int_s<nbits, behavior> > + : public typetraits<sint_value<int_s<nbits, behavior> > > { typedef int_s<nbits, behavior> self; typedef signed_integer abstract_type; @@ -213,10 +214,11 @@ template <unsigned nbits, class behavior> struct optraits<int_s<nbits, behavior> > : - public optraits_int_s<int_s<nbits, behavior> > + public optraits<sint_value<int_s<nbits, behavior> > > { public: typedef int_s<nbits, behavior> self; + typedef optraits<sint_value<int_s<nbits, behavior> > > super; private: typedef typename typetraits<self>::base_type base_type_; @@ -250,17 +252,17 @@ // int_sN == int_u32; int_u32 == int_sN - template <class B2> + template <unsigned mbits, class B1, class B2> static bool - cmp_eq(const self& lhs, const int_u<32, B2>& rhs) + cmp_eq(const int_s<mbits, B1>& lhs, const int_u<32, B2>& rhs) { if (lhs.val() < 0) return false; return static_cast<int_u<32, B2> >(lhs).val() == rhs.val(); } - template <class B1> - static bool cmp_eq(const int_u<32, B1>& lhs, const self& rhs) + template <unsigned mbits, class B1, class B2> + static bool cmp_eq(const int_u<32, B1>& lhs, const int_s<mbits, B2>& rhs) { return cmp_eq(rhs, lhs); } // <T1> == <T2> @@ -268,7 +270,7 @@ template <class T1, class T2> static bool cmp_eq(const T1& lhs, const T2& rhs) - { return optraits_scalar<self>::cmp_eq(lhs, rhs); } + { return super::cmp_eq(lhs, rhs); } // // cmp_lt @@ -276,17 +278,17 @@ // int_sN < int_u32; int_u32 < int_sN - template <class B2> + template <unsigned mbits, class B1, class B2> static bool - cmp_lt(const self& lhs, const int_u<32, B2>& rhs) + cmp_lt(const int_s<mbits, B1>& lhs, const int_u<32, B2>& rhs) { if (lhs.val() < 0) return true; return static_cast<int_u<32, B2> >(lhs).val() < rhs.val(); } - template <class B1> - static bool cmp_lt(const int_u<32, B1>& lhs, const self& rhs) + template <unsigned mbits, class B1, class B2> + static bool cmp_lt(const int_u<32, B1>& lhs, const int_s<mbits, B2>& rhs) { if (rhs.val() < 0) return false; @@ -299,7 +301,7 @@ template <class T1, class T2> static bool cmp_lt(const T1& lhs, const T2& rhs) - { return optraits_scalar<self>::cmp_lt(lhs, rhs); } + { return super::cmp_lt(lhs, rhs); } // debug static std::string name() { Index: integre/ntg/real/int_u.hh --- integre/ntg/real/int_u.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.17 640) +++ integre/ntg/real/int_u.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/23_int_u.hh 1.19.1.18 640) @@ -63,6 +63,7 @@ template <unsigned nbits, class behavior> struct typetraits<int_u<nbits, behavior> > + : public typetraits<uint_value<int_u<nbits, behavior> > > { typedef int_u<nbits, behavior> self; typedef unsigned_integer abstract_type; @@ -213,7 +214,7 @@ template <unsigned nbits, class behavior> struct optraits<int_u<nbits, behavior> > : - public optraits_int_u<int_u<nbits, behavior> > + public optraits<uint_value<int_u<nbits, behavior> > > { private: typedef int_u<nbits, behavior> self; Index: integre/ntg/real/optraits_builtin_int.hh --- integre/ntg/real/optraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/18_optraits_b 1.6.1.9 640) +++ integre/ntg/real/optraits_builtin_int.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/18_optraits_b 1.6.1.10 640) @@ -47,7 +47,7 @@ # define OPTRAITS_BUILTIN_INT_U(Name, Max) \ template <> \ - struct optraits<Name> : public optraits_int_u<Name> \ + struct optraits<Name> : public optraits<uint_value<Name> > \ { \ static Name max() { return Max; } \ static std::string name() { return std::string(#Name); } \ @@ -55,7 +55,7 @@ # define OPTRAITS_BUILTIN_INT_S(Name, Min, Max) \ template <> \ - struct optraits<Name> : public optraits_int_s<Name> \ + struct optraits<Name> : public optraits<sint_value<Name> > \ { \ static Name min() { return Min; } \ static Name max() { return Max; } \ Index: integre/ntg/real/optraits_real.hh --- integre/ntg/real/optraits_real.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.9 640) +++ integre/ntg/real/optraits_real.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/12_optraits_s 1.11.1.10 640) @@ -39,7 +39,6 @@ // -- # include <ntg/core/internal/global_ops_traits.hh> -# include <ntg/core/type_traits.hh> # include <ntg/core/macros.hh> // macros definitions @@ -49,16 +48,16 @@ namespace internal { - /*----------------. - | optraits_scalar | - `----------------*/ + /*---------------------. + | optraits<real_value> | + `---------------------*/ //! Implement common operators for scalars - template <class Self> - class optraits_scalar : public optraits_top<Self> + template <class E> + class optraits<real_value<E> > : public optraits<value<E> > { private: - typedef typename typetraits<Self>::storage_type storage_type_; + typedef typename typetraits<E>::storage_type storage_type_; public: static storage_type_ zero () { return 0; } @@ -86,60 +85,61 @@ CMP_SCALAR_OPERATOR(cmp_lt, <) }; - /*---------------. - | optraits_float | - `---------------*/ - template <class Self> - class optraits_float : public optraits_scalar<Self> + /*----------------------. + | optraits<float_value> | + `----------------------*/ + + template <class E> + class optraits<float_value<E> > : public optraits<real_value<E> > { public: // This is the standard size for float on std::ostream. static unsigned max_print_width () { return 11U; } }; - /*-------------. - | optraits_int | - `-------------*/ + /*--------------------. + | optraits<int_value> | + `--------------------*/ - template <class Self> - class optraits_int : public optraits_scalar<Self> + template <class E> + class optraits<int_value<E> > : public optraits<real_value<E> > { - typedef typename typetraits<Self>::storage_type storage_type_; + typedef typename typetraits<E>::storage_type storage_type_; public: - static storage_type_ inf () { return optraits<Self>::min(); } - static storage_type_ sup () { return optraits<Self>::max(); } + static storage_type_ inf () { return optraits<E>::min(); } + static storage_type_ sup () { return optraits<E>::max(); } static unsigned max_print_width () { - return (unsigned) log10(double(optraits<Self>::max())) + 1; + return (unsigned) log10(double(optraits<E>::max())) + 1; } ASSIGN_INT_OPERATOR(mod_equal, %) ARITH_INT_OPERATOR(mod, %=) }; - /*---------------. - | optraits_int_u | - `---------------*/ + /*---------------------. + | optraits<uint_value> | + `---------------------*/ - template <class Self> - class optraits_int_u : public optraits_int<Self> + template <class E> + class optraits<uint_value<E> > : public optraits<int_value<E> > { private: - typedef typename typetraits<Self>::storage_type storage_type_; + typedef typename typetraits<E>::storage_type storage_type_; public: static storage_type_ min () { return 0; } }; - /*---------------. - | optraits_int_s | - `---------------*/ + /*---------------------. + | optraits<sint_value> | + `---------------------*/ - template <class Self> - class optraits_int_s : public optraits_int<Self> + template <class E> + class optraits<sint_value<E> > : public optraits<int_value<E> > {}; } // end of internal Index: integre/ntg/core/value.hh --- integre/ntg/core/value.hh Tue, 13 May 2003 21:32:45 +0200 burrus_n (oln/g/8_rec_value. 1.8.1.8 640) +++ integre/ntg/core/value.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/8_rec_value. 1.8.1.9 640) @@ -103,6 +103,18 @@ storage_type val_; }; + namespace internal { + + template <class E> + struct typetraits<value<E> > + {}; + + template <class E> + struct optraits<value<E> > + {}; + + } + } // end of ntg. #endif // !NTG_CORE_VALUE_HH Index: integre/ntg/real/typetraits_builtin_int.hh --- integre/ntg/real/typetraits_builtin_int.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/g/3_typetraits 1.7.1.12 640) +++ integre/ntg/real/typetraits_builtin_int.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/g/3_typetraits 1.7.1.13 640) @@ -36,9 +36,9 @@ | macros | `-------*/ -# define TYPETRAITS_BUILTIN_INT(Name) \ +# define TYPETRAITS_BUILTIN_INT(Name, Value) \ template<> \ - struct typetraits<Name> \ + struct typetraits<Name> : public typetraits<Value<Name> > \ { \ typedef Name self; \ typedef builtin::to_ntg<Name>::ret ntg_type; \ @@ -152,18 +152,18 @@ namespace internal { - TYPETRAITS_BUILTIN_INT(unsigned long) - TYPETRAITS_BUILTIN_INT( signed long) + TYPETRAITS_BUILTIN_INT(unsigned long, uint_value) + TYPETRAITS_BUILTIN_INT(signed long, sint_value) - TYPETRAITS_BUILTIN_INT(unsigned int) - TYPETRAITS_BUILTIN_INT( signed int) + TYPETRAITS_BUILTIN_INT(unsigned int, uint_value) + TYPETRAITS_BUILTIN_INT(signed int, sint_value) - TYPETRAITS_BUILTIN_INT(unsigned short) - TYPETRAITS_BUILTIN_INT( signed short) + TYPETRAITS_BUILTIN_INT(unsigned short, uint_value) + TYPETRAITS_BUILTIN_INT(signed short, sint_value) - TYPETRAITS_BUILTIN_INT(unsigned char) - TYPETRAITS_BUILTIN_INT( signed char) - TYPETRAITS_BUILTIN_INT( char) + TYPETRAITS_BUILTIN_INT(unsigned char, uint_value) + TYPETRAITS_BUILTIN_INT(signed char, sint_value) + TYPETRAITS_BUILTIN_INT(char, sint_value) } // end of internal. Index: integre/ntg/real/real_value.hh --- integre/ntg/real/real_value.hh Sun, 04 May 2003 21:38:39 +0200 burrus_n (oln/s/15_real_value 1.2 640) +++ integre/ntg/real/real_value.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/15_real_value 1.3 640) @@ -28,42 +28,30 @@ #ifndef NTG_REAL_REAL_VALUE_HH # define NTG_REAL_REAL_VALUE_HH +# include <ntg/core/type_traits.hh> # include <ntg/core/value.hh> +# define declare_real_value_type__(Type, Parent) \ + template <class E> \ + class Type : public Parent<E> \ + {}; \ + \ + namespace internal { \ + \ + template <class E> \ + struct typetraits<Type<E> > : public typetraits<Parent<E> > \ + {}; \ + \ + } + namespace ntg { - /*-----------. - | real_value | - `-----------*/ - - template <class E> - class real_value : public value<E> - {}; - - /*----------. - | int_value | - `----------*/ - - template <class E> - class int_value : public real_value<E> - {}; - - template <class E> - class uint_value : public int_value<E> - {}; - - template <class E> - class sint_value : public int_value<E> - {}; - - /*------------. - | float_value | - `------------*/ - - template <class E> - class float_value : public real_value<E> - {}; + declare_real_value_type__(real_value, value) + declare_real_value_type__(float_value, real_value) + declare_real_value_type__(int_value, real_value) + declare_real_value_type__(uint_value, int_value) + declare_real_value_type__(sint_value, int_value) } // end of ntg. Index: integre/ntg/core/internal/traits.hh --- integre/ntg/core/internal/traits.hh Sun, 03 Aug 2003 21:08:04 +0200 burrus_n (oln/s/16_traits.hh 1.4 640) +++ integre/ntg/core/internal/traits.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/16_traits.hh 1.5 640) @@ -62,21 +62,6 @@ | optraits | `---------*/ - // top of hierarchy - template <class T> - struct optraits_top - {}; - - // enumerated types - template <class T> - class optraits_enum : public optraits_top<T> - {}; - - // vectorial types - template <class T> - class optraits_vector : public optraits_top<T> - {}; - //! Associates functions to types. /* It should be specialized for every types. Index: integre/ntg/vect/vect_value.hh --- integre/ntg/vect/vect_value.hh Sun, 27 Jul 2003 19:14:42 +0200 burrus_n (oln/s/22_vect_value 1.2 640) +++ integre/ntg/vect/vect_value.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/22_vect_value 1.3 640) @@ -51,6 +51,18 @@ static unsigned size() { return nb_comp; } }; + namespace internal { + + template <class E> + class typetraits<vect_value<E> > : public typetraits<value<E> > + {}; + + template <class E> + class optraits<vect_value<E> > : public optraits<value<E> > + {}; + + } + } #endif // !NTG_VECT_VECT_VALUE_HH Index: integre/ntg/enum/enum_value.hh --- integre/ntg/enum/enum_value.hh Sun, 04 May 2003 16:11:37 +0200 burrus_n (oln/s/23_enum_value 1.1 640) +++ integre/ntg/enum/enum_value.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/23_enum_value 1.2 640) @@ -29,6 +29,7 @@ # define NTG_ENUM_ENUM_VALUE_HH # include <ntg/core/value.hh> +# include <ntg/core/type_traits.hh> namespace ntg { @@ -41,6 +42,18 @@ class enum_value : public value<E> {}; + namespace internal { + + template <class E> + class typetraits<enum_value<E> > : public typetraits<value<E> > + {}; + + template <class E> + class optraits<enum_value<E> > : public optraits<value<E> > + {}; + + } + } #endif // !NTG_ENUM_ENUM_VALUE_HH Index: integre/ntg/real/builtin_float.hh --- integre/ntg/real/builtin_float.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/s/47_builtin_fl 1.3 640) +++ integre/ntg/real/builtin_float.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/s/47_builtin_fl 1.4 640) @@ -47,7 +47,7 @@ `------------------*/ template <> - struct typetraits<float> + struct typetraits<float> : public typetraits<float_value<float> > { typedef float self; typedef decimal abstract_type; @@ -76,7 +76,7 @@ `-------------------*/ template <> - struct typetraits<double> + struct typetraits<double> : public typetraits<float_value<double> > { typedef double self; typedef decimal abstract_type; @@ -105,7 +105,7 @@ `----------------*/ template <> - struct optraits<float> : public optraits_float<float> + struct optraits<float> : public optraits<float_value<float> > { private: typedef float self; @@ -251,7 +251,7 @@ `-----------------*/ template <> - struct optraits<double> : public optraits_float<double> + struct optraits<double> : public optraits<float_value<double> > { private: // shortcuts Index: integre/ntg/real/range.hh --- integre/ntg/real/range.hh Wed, 26 Nov 2003 16:45:27 +0100 burrus_n (oln/t/16_range.hh 1.4 640) +++ integre/ntg/real/range.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/16_range.hh 1.5 640) @@ -46,7 +46,7 @@ `------------------*/ template <class T, class interval, class behavior> - struct typetraits<range<T, interval, behavior> > + struct typetraits<range<T, interval, behavior> > : public typetraits<T> { typedef range<T, interval, behavior> self; typedef ntgi_abstract_type(T) abstract_type; Index: integre/ntg/real/cycle.hh --- integre/ntg/real/cycle.hh Mon, 21 Jul 2003 17:51:12 +0200 burrus_n (oln/t/17_cycle.hh 1.2 640) +++ integre/ntg/real/cycle.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/17_cycle.hh 1.3 640) @@ -46,7 +46,7 @@ `------------------*/ template <class T, class interval> - struct typetraits<cycle<T, interval> > + struct typetraits<cycle<T, interval> > : public typetraits<T> { typedef cycle<T, interval> self; typedef typename typetraits<T>::abstract_type abstract_type; Index: integre/ntg/vect/vec.hh --- integre/ntg/vect/vec.hh Thu, 07 Aug 2003 02:37:23 +0200 burrus_n (oln/t/18_vec.hh 1.7 640) +++ integre/ntg/vect/vec.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/18_vec.hh 1.8 640) @@ -89,7 +89,7 @@ `----------------*/ template <unsigned N, class T, class Self> - struct typetraits<vec<N, T, Self> > + struct typetraits<vec<N, T, Self> > : public typetraits<vect_value<vec<N, T, Self> > > { enum { nb_comp = N }; @@ -186,7 +186,7 @@ `--------------*/ template <unsigned N, class T, class E> - class optraits<vec<N, T, E> > : public optraits_vector<vec<N, T, E> > + class optraits<vec<N, T, E> > : public optraits<vect_value<vec<N, T, E> > > { typedef vec<N, T, E> self; typedef ntgi_storage_type(self) storage_type_; Index: integre/ntg/enum/bin.hh --- integre/ntg/enum/bin.hh Mon, 10 Nov 2003 11:19:49 +0100 burrus_n (oln/t/21_bin.hh 1.5 640) +++ integre/ntg/enum/bin.hh Thu, 27 Nov 2003 11:17:00 +0100 burrus_n (oln/t/21_bin.hh 1.6 640) @@ -49,7 +49,7 @@ `----------------*/ template <> - struct typetraits<bin> + struct typetraits<bin> : typetraits<enum_value<bin> > { typedef binary abstract_type; typedef bin self; @@ -133,7 +133,7 @@ `--------------*/ template <> - struct optraits<bin> : public optraits_enum<bin> + struct optraits<bin> : public optraits<enum_value<bin> > { private: typedef typetraits<bin>::storage_type storage_type_;

21 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

Olena