Fraction.st
author Claus Gittinger <cg@exept.de>
Wed, 15 May 2019 17:03:42 +0200
changeset 24123 d3c4267aa343
parent 22895 711322e64257
child 24135 1172bf7d7292
permissions -rw-r--r--
#BUGFIX by cg class: Smalltalk class changed: #basicLoadPackage:fromDirectory:asAutoloaded:
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
     1
"{ Encoding: utf8 }"
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
     2
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     3
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     4
 COPYRIGHT (c) 1989 by Claus Gittinger
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
     5
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    12
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    13
"
5552
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
    14
"{ Package: 'stx:libbasic' }"
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
    15
18839
aa7721c46f4e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18240
diff changeset
    16
"{ NameSpace: Smalltalk }"
aa7721c46f4e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18240
diff changeset
    17
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    18
Number subclass:#Fraction
5552
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
    19
	instanceVariableNames:'numerator denominator'
21974
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
    20
	classVariableNames:'FractionOne FractionZero PrintWholeNumbers Pi Pi_1000 E'
5552
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
    21
	poolDictionaries:''
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
    22
	category:'Magnitude-Numbers'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
    25
!Fraction class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    26
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    27
copyright
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    28
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    29
 COPYRIGHT (c) 1989 by Claus Gittinger
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
    30
	      All Rights Reserved
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    31
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    32
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    33
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    34
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    35
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    36
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    37
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    38
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    39
!
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    40
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    41
documentation
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    42
"
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    43
    Instances of Fraction represent fractional numbers consisting of
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    44
    a numerator and denominator. Both are themselfes arbitrary precision
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
    45
    integers.
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    46
    Fractions are usually created by dividing Integers using / (for exact division).
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    47
    Notice, that all operations on fractions reduce their result; this means, that
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    48
    the result of a fraction-operation may return an integer.
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    49
    Aka:
21766
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    50
        (1 / 7) * 7   ->  1  (not 0.99999999...)
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
    51
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
    52
    Mixed mode arithmetic:
21766
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    53
        fraction op fraction    -> fraction/integer
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    54
        fraction op fix         -> fix; scale is fix's scale
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    55
        fraction op integer     -> fraction/integer
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    56
        fraction op float       -> float
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
    57
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    58
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    59
    [classVariables:]
21766
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    60
        PrintWholeNumbers       Boolean        experimental:
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    61
                                                controls how fractions which are greater than 1 are printed.
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    62
                                                if true, print them as a sum of an integral and the fractional part.
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    63
                                                (Large ones are easier to read this way)
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    64
                                                     (17/3) printString  -> '(5+(2/3))'
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    65
                                                for now, the default is false, for backward compatibility
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
    66
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
    67
    [author:]
21766
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    68
        Claus Gittinger
1556
134d96466f5a commentary
Claus Gittinger <cg@exept.de>
parents: 1555
diff changeset
    69
134d96466f5a commentary
Claus Gittinger <cg@exept.de>
parents: 1555
diff changeset
    70
    [see also:]
21766
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    71
        Number
4974e66281d4 #OTHER by mawalch
mawalch
parents: 20416
diff changeset
    72
        FixedPoint Float ShortFloat LongFloat Integer Complex
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1264
diff changeset
    73
"
88
81dacba7a63a *** empty log message ***
claus
parents: 77
diff changeset
    74
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    75
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
    76
!Fraction class methodsFor:'instance creation'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    77
a27a279701f8 Initial revision
claus
parents:
diff changeset
    78
new
a27a279701f8 Initial revision
claus
parents:
diff changeset
    79
    "create and return a new fraction with value 0"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    80
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
    81
    ^ self numerator:0 denominator:1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    82
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    83
a27a279701f8 Initial revision
claus
parents:
diff changeset
    84
numerator:num denominator:den
8629
07ece572135f care for zeroDivide
penk
parents: 8395
diff changeset
    85
    "create and return a new fraction with numerator num and denominator den.
07ece572135f care for zeroDivide
penk
parents: 8395
diff changeset
    86
     Notice: stc inlines this message if sent to the global named Fraction."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    87
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
    88
    |newFraction|
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
    89
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    90
%{  /* NOCONTEXT */
18240
28af09029a8b ifdef for SCHTEAM engine changed (not relevant for ST/X)
Claus Gittinger <cg@exept.de>
parents: 18239
diff changeset
    91
#ifdef __SCHTEAM__
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
    92
    if (self == Fraction.Class) {
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
    93
	return context._RETURN(new STFraction(num, den));
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
    94
    }
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
    95
#else
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
    96
    /* this check allows subclassing .. */
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    97
    if (self == Fraction) {
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
    98
	if (__bothSmallInteger(num, den)) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
    99
	    if (den != __mkSmallInteger(0)) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   100
		if (__CanDoQuickNew(sizeof(struct __Fraction))) {    /* OBJECT ALLOCATION */
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   101
		    OBJ newFraction;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   102
		    INT iDen;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   103
		    INT iNum;
19259
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   104
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   105
		    __qCheckedNew(newFraction, sizeof(struct __Fraction));
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   106
		    __InstPtr(newFraction)->o_class = self;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   107
		    __qSTORE(newFraction, self);
19259
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   108
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   109
		    iDen = __intVal(den);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   110
		    iNum = __intVal(num);
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   111
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   112
		    if (iDen < 0) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   113
			iNum = -iNum;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   114
			iDen = -iDen;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   115
		    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   116
		    while ( (((iNum | iDen) & 1) == 0) && ( iNum != 0) && ( iDen != 0)) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   117
			/* both even and non-zero */
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   118
			iNum = iNum >> 1;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   119
			iDen = iDen >> 1;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   120
		    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   121
		    if (iNum >= _MAX_INT) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   122
			__FractionInstPtr(newFraction)->f_numerator = __MKINT(iNum);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   123
		    } else {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   124
			__FractionInstPtr(newFraction)->f_numerator = __MKSMALLINT(iNum);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   125
		    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   126
		    if (iDen >= _MAX_INT) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   127
			__FractionInstPtr(newFraction)->f_denominator = __MKINT(iDen);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   128
		    } else {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   129
			__FractionInstPtr(newFraction)->f_denominator = __MKSMALLINT(iDen);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   130
		    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   131
		    if (iNum == 1) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   132
			/* no need to reduce */
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   133
			RETURN ( newFraction );
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   134
		    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   135
		}
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   136
	    }
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   137
	}
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   138
    }
18240
28af09029a8b ifdef for SCHTEAM engine changed (not relevant for ST/X)
Claus Gittinger <cg@exept.de>
parents: 18239
diff changeset
   139
#endif /* not __SCHTEAM__ */
2790
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
   140
%}.
8629
07ece572135f care for zeroDivide
penk
parents: 8395
diff changeset
   141
    den = 0 ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   142
	^ ZeroDivide raiseRequestWith:thisContext.
7140
f65ec31fc081 oops - noone cared for generating fractions with 0 denominator
Claus Gittinger <cg@exept.de>
parents: 7139
diff changeset
   143
    ].
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
   144
    newFraction isNil ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   145
	newFraction := self basicNew setNumerator:num denominator:den.
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
   146
    ].
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
   147
    ^ newFraction reduced
7140
f65ec31fc081 oops - noone cared for generating fractions with 0 denominator
Claus Gittinger <cg@exept.de>
parents: 7139
diff changeset
   148
f65ec31fc081 oops - noone cared for generating fractions with 0 denominator
Claus Gittinger <cg@exept.de>
parents: 7139
diff changeset
   149
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   150
     Fraction numerator:1 denominator:3
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   151
     Fraction numerator:2 denominator:3
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   152
     Fraction numerator:2 denominator:6
19259
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   153
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   154
     Fraction numerator:1 denominator:0  -> error
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   155
     Fraction numerator:2 denominator:0  -> error
7140
f65ec31fc081 oops - noone cared for generating fractions with 0 denominator
Claus Gittinger <cg@exept.de>
parents: 7139
diff changeset
   156
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   157
     Fraction numerator:5 denominator:10
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   158
     Fraction numerator:50 denominator:100
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   159
     Fraction numerator:8 denominator:16
7140
f65ec31fc081 oops - noone cared for generating fractions with 0 denominator
Claus Gittinger <cg@exept.de>
parents: 7139
diff changeset
   160
    "
19259
9e95248432bd #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19248
diff changeset
   161
19261
02cb0c66a1b8 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19259
diff changeset
   162
    "Modified: / 27-02-2016 / 00:25:47 / cg"
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   163
!
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   164
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   165
readDecimalFractionFrom:aStringOrStream onError:exceptionBlock
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   166
    "Read an arbitrary number (>0) of digits representing a decimal fraction."
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   167
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   168
    |numDigits factor fraction s ch denom|
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   169
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   170
    s := aStringOrStream isStream ifTrue:[aStringOrStream] ifFalse:[aStringOrStream readStream].
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   171
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   172
    factor := (1 / 10).
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   173
    fraction := 0.
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   174
    numDigits := 0.
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   175
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   176
    [
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   177
        ch := s peekOrNil.
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   178
        ch notNil and:[ch isDigit].
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   179
    ] whileTrue: [
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   180
        s next.
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   181
        fraction := fraction*10 + (ch digitValue).
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   182
        numDigits := numDigits + 1.
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   183
    ].
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   184
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   185
    numDigits > 0 ifFalse:[^ exceptionBlock valueWithOptionalArgument: 'Missing digits in fraction'].
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   186
    numDigits <= 10 ifTrue:[
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   187
        denom := #(10 100 1000 10000 100000
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   188
                   1000000 10000000 100000000 1000000000 10000000000) at:numDigits.
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   189
    ] ifFalse:[
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   190
        denom := 10 raisedTo:numDigits.
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   191
    ].
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
   192
    ^ fraction / denom
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   193
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   194
    "
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   195
     Fraction readDecimalFractionFrom:'1'   onError:[nil]     -> 0.1
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   196
     Fraction readDecimalFractionFrom:'123' onError:[nil]     -> 0.123
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   197
     Fraction readDecimalFractionFrom:'5'   onError:[nil]     -> 0.5
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   198
     Fraction readDecimalFractionFrom:'005' onError:[nil]     -> 0.005
16938
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   199
     Fraction readDecimalFractionFrom:''    onError:[nil]     -> nil
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   200
     Fraction readDecimalFractionFrom:'aa'  onError:[nil]     -> nil
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   201
    "
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   202
!
ffe3202e45bd class: Fraction
Claus Gittinger <cg@exept.de>
parents: 16729
diff changeset
   203
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   204
readFrom:aStringOrStream onError:exceptionBlock
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   205
    |s numerator denominator hasParen result|
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   206
11901
285349acebd8 readFrom
Claus Gittinger <cg@exept.de>
parents: 11899
diff changeset
   207
    "/ sigh - care for subclasses...
285349acebd8 readFrom
Claus Gittinger <cg@exept.de>
parents: 11899
diff changeset
   208
    self == Fraction ifFalse:[
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   209
        ^ super readFrom:aStringOrStream onError:exceptionBlock
11901
285349acebd8 readFrom
Claus Gittinger <cg@exept.de>
parents: 11899
diff changeset
   210
    ].
285349acebd8 readFrom
Claus Gittinger <cg@exept.de>
parents: 11899
diff changeset
   211
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   212
    s := aStringOrStream readStream.
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   213
    s skipSeparators.
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   214
    hasParen := s peekFor:$(.
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   215
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   216
    numerator := super readFrom:s onError:[^ exceptionBlock value].
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   217
    numerator isInteger ifTrue:[
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   218
        s skipSeparators.
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   219
        (s peekFor:$/) ifTrue:[
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   220
            denominator := Integer readFrom:s onError:[^ exceptionBlock value].
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   221
            result := self numerator:numerator denominator:denominator
22608
78704fb221f9 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22607
diff changeset
   222
        ] ifFalse:[
78704fb221f9 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22607
diff changeset
   223
            result := numerator.
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   224
        ].
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   225
    ].
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   226
    hasParen ifTrue:[
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   227
        s skipSeparators.
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   228
        (s peekFor:$)) ifFalse:exceptionBlock.
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   229
    ].
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   230
    result notNil ifTrue:[
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   231
        ^ result.
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   232
    ].
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   233
    ^ numerator asFraction.
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   234
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   235
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   236
    "
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   237
     Fraction readFromString:'1'
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   238
     Fraction readFromString:'2'
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   239
     Fraction readFromString:'1.5'
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   240
     Fraction readFromString:'1/5'
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   241
     Fraction readFromString:'(1/5)'
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   242
     Fraction readFromString:'(1/5'
11899
ad777208fdb5 added fraction-readFrom
Claus Gittinger <cg@exept.de>
parents: 11734
diff changeset
   243
    "
22607
4eb32d774d9c #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22254
diff changeset
   244
22608
78704fb221f9 #BUGFIX by stefan
Stefan Vogel <sv@exept.de>
parents: 22607
diff changeset
   245
    "Modified: / 14-03-2018 / 19:02:44 / stefan"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   246
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   247
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   248
!Fraction class methodsFor:'class initialization'!
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   249
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   250
initialize
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   251
    FractionZero isNil ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   252
	FractionZero := self numerator:0 denominator:1.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   253
	FractionOne := self numerator:1 denominator:1
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   254
    ]
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   255
! !
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   256
21819
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   257
!Fraction class methodsFor:'coercing & converting'!
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   258
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   259
coerce:aNumber
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   260
    "convert the argument aNumber into an instance of the receiver's class and return it."
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   261
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   262
    ^ aNumber asFraction
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   263
! !
c62073747a0a #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21766
diff changeset
   264
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   265
!Fraction class methodsFor:'constants'!
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   266
21974
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   267
e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   268
    "return an approximation of the constant e as Fraction.
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   269
     The approx. returned here has an error smaller than representable by float instances
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   270
     (roughly 26 valid digits)"
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   271
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   272
    E isNil ifTrue:[
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   273
        E := self
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   274
                numerator:  271828182845904523536028747 
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   275
                denominator:100000000000000000000000000
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   276
    ].
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   277
    ^ E
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   278
    
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   279
    "E := nil
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   280
    
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   281
     Fraction e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   282
     Fraction e asFloat - Float e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   283
     Fraction e asLongFloat - LongFloat e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   284
     Float e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   285
     FixedPoint e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   286
    "
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   287
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   288
    "Created: / 03-07-2017 / 17:22:47 / cg"
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   289
!
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   290
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   291
e_approximation
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   292
    "return an approximation of e as Fraction.
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   293
     The approx. returned is good for 6 valid digits and has an error of less than -2.67-07.
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   294
     The value might be useful to avoid floating point numbers in graphic rendering code,
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   295
     where 6 digits of precision are usually good enough."
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   296
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   297
    ^ self
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   298
        numerator:67957
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   299
        denominator:25000
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   300
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   301
    "
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   302
     Fraction e
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   303
     Fraction e asFloat               
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   304
     Fraction e_approximation asFloat 
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   305
     
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   306
     (Fraction e - Fraction e_approximation asFloat) abs
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   307
     (Float e - Fraction e_approximation asFloat) abs
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   308
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   309
     19/7 can be used as an approx with ~1% error:
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   310
         Float e - (19/7) asFloat
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   311
         
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   312
     87/32 is another candidate:
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   313
         Float e - (87/32) asFloat 
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   314
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   315
     and 106/39:
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   316
         Float e - (106/39) asFloat 
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   317
    "
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   318
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   319
    "Created: / 03-07-2017 / 17:21:38 / cg"
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   320
!
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   321
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   322
pi
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   323
    "return an approximation of the constant pi as Fraction.
21944
5f6d5497f82a #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21943
diff changeset
   324
     The approx. returned here has an error smaller than representable by float instances
5f6d5497f82a #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21943
diff changeset
   325
     (roughly 26 valid digits)"
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   326
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   327
    Pi isNil ifTrue:[
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   328
        Pi := self
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   329
            numerator:  314159265358979323846264343
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   330
            denominator:100000000000000000000000000
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   331
    ].
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   332
    ^ Pi
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   333
    
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   334
    "
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   335
     ^ self
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   336
        numerator:  314159265358979323846264338327950288419716939937510582097494459
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   337
        denominator:100000000000000000000000000000000000000000000000000000000000000
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   338
    "
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   339
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   340
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   341
     Fraction pi
13357
487c502b40b7 comment/format in: #pi
Claus Gittinger <cg@exept.de>
parents: 11901
diff changeset
   342
     Fraction pi asFloat - Float pi
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   343
     Fraction pi asLongFloat - LongFloat pi
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   344
     Float pi
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   345
    "
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   346
21944
5f6d5497f82a #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21943
diff changeset
   347
    "Modified (comment): / 03-07-2017 / 13:21:03 / cg"
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   348
!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   349
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   350
pi1000
21944
5f6d5497f82a #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21943
diff changeset
   351
    "return an approximation of the constant pi as Fraction (>= 1000 valid decimal digits)."
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   352
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   353
    Pi_1000 isNil ifTrue:[
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   354
        Pi_1000 := self
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   355
                        numerator:  31415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491298336733624406566430860213949463952247371907021798609437027705392171762931767523846748184676694051320005681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499510597317328160963185950244594553469083026425223082533446850352619311881710100031378387528865875332083814206171776691473035982534904287554687311595628638823537875937519577818577805321712268066130019278766111959092164201989380952572010654858632788
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   356
                        denominator:10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000.
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   357
    ].
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   358
    ^ Pi_1000
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   359
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   360
    "
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   361
     Pi_1000 := nil.
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   362
     Fraction pi1000
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   363
     Fraction pi1000 asLongFloat - LongFloat pi
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   364
     LongFloat pi
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   365
    "
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   366
21944
5f6d5497f82a #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21943
diff changeset
   367
    "Modified (comment): / 03-07-2017 / 13:21:15 / cg"
19248
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   368
!
a34488b9f1e6 #FEATURE
Stefan Vogel <sv@exept.de>
parents: 19241
diff changeset
   369
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   370
pi_approximation
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   371
    "return an approximation of the constant pi as Fraction.
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   372
     The approx. returned is good for 6 valid digits and has an error of less than -2.67-07.
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   373
     The value might be useful to avoid floating point numbers in graphic rendering code,
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   374
     where 6 digits of precision are usually good enough."
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   375
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   376
    ^ self
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   377
        numerator:355
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   378
        denominator:113
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   379
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   380
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   381
     Fraction pi
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   382
     Fraction pi asFloat
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   383
     
21943
dbca6e4e1ba5 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 21942
diff changeset
   384
     (Fraction pi - Fraction pi_approximation asFloat) abs
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   385
     (Float pi - Fraction pi_approximation asFloat) abs
21974
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   386
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   387
     22/7 can be used as an approx with 1% error:
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   388
         Float pi - (22/7) asFloat
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   389
    "
21942
73cd95d3f948 #REFACTORING by cg
Claus Gittinger <cg@exept.de>
parents: 21819
diff changeset
   390
21974
cf76d289d886 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21944
diff changeset
   391
    "Modified (comment): / 03-07-2017 / 17:31:44 / cg"
11671
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   392
!
6901343001b6 approx pi
Claus Gittinger <cg@exept.de>
parents: 11250
diff changeset
   393
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   394
unity
1555
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   395
    "return the neutral element for multiplication (1 / 1)"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   396
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   397
    ^ FractionOne
1555
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   398
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   399
    "Modified: 18.7.1996 / 12:26:06 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   400
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   401
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   402
zero
1555
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   403
    "return the neutral element for addition (0 / 1)"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   404
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   405
    ^ FractionZero
1555
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   406
316491c1b216 commentary
Claus Gittinger <cg@exept.de>
parents: 1295
diff changeset
   407
    "Modified: 18.7.1996 / 12:26:12 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   408
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   409
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   410
!Fraction class methodsFor:'queries'!
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   411
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   412
isBuiltInClass
1264
8d916aa63bce commentary
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   413
    "return true if this class is known by the run-time-system.
8d916aa63bce commentary
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   414
     Here, true is returned for myself, false for subclasses."
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   415
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   416
    ^ self == Fraction
1264
8d916aa63bce commentary
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   417
8d916aa63bce commentary
Claus Gittinger <cg@exept.de>
parents: 1200
diff changeset
   418
    "Modified: 23.4.1996 / 15:59:10 / cg"
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   419
! !
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
   420
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   421
!Fraction methodsFor:'accessing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   422
a27a279701f8 Initial revision
claus
parents:
diff changeset
   423
denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   424
    "return the denominator"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   425
a27a279701f8 Initial revision
claus
parents:
diff changeset
   426
    ^ denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   427
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   428
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   429
numerator
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   430
    "return the numerator"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   431
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   432
    ^ numerator
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   433
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   434
a27a279701f8 Initial revision
claus
parents:
diff changeset
   435
!Fraction methodsFor:'arithmetic'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   436
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   437
* aNumber
11734
7c2cc71aabc9 comment
Claus Gittinger <cg@exept.de>
parents: 11722
diff changeset
   438
    "return the product of the receiver and the argument."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   439
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   440
    "/ notice:
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   441
    "/ the following code handles some common cases,
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   442
    "/ and exists as an optimization, to speed up those cases.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   443
    "/ also notice, that checks for those cases must be inlinable without
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   444
    "/ a message send; otherwise double-dispatch is just as fast.
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   445
    "/
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   446
    "/ Conceptionally, (and for most other argument types),
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   447
    "/ mixed arithmetic is implemented by double dispatching
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   448
    "/ (see the message send at the bottom)
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   449
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   450
    (aNumber isMemberOf:SmallInteger) ifTrue:[
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   451
        ^ self class
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   452
                numerator:(numerator * aNumber)
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   453
                denominator:denominator
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   454
    ].
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   455
    aNumber isFloat ifTrue:[
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   456
        ^ (numerator * aNumber) / denominator
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   457
    ].
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   458
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   459
    ^ aNumber productFromFraction:self
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   460
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   461
    "
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   462
        2/3 * 3 asLongFloat
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   463
    "
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   464
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   465
    "Modified: / 28-07-1997 / 19:09:23 / cg"
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   466
    "Modified (comment): / 14-09-2017 / 15:27:30 / stefan"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   467
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   468
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   469
+ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   470
    "return the sum of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   471
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   472
    "/ notice:
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   473
    "/ the following code handles some common cases,
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   474
    "/ and exists as an optimization, to speed up those cases.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   475
    "/ also notice, that checks for those cases must be inlinable without
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   476
    "/ a message send; otherwise double-dispatch is just as fast.
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   477
    "/
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   478
    "/ Conceptionally, (and for most other argument types),
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   479
    "/ mixed arithmetic is implemented by double dispatching
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   480
    "/ (see the message send at the bottom)
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   481
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   482
    (aNumber isMemberOf:SmallInteger) ifTrue:[
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   483
        ^ self class
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   484
            numerator:(numerator + (denominator * aNumber))
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   485
            denominator:denominator
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   486
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   487
    (aNumber isMemberOf:Float) ifTrue:[
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   488
        ^ (numerator asFloat / denominator asFloat) + aNumber
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   489
    ].
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   490
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   491
    ^ aNumber sumFromFraction:self
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   492
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   493
    "
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   494
        2/3 + 10 asLongFloat
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   495
    "
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   496
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   497
    "Modified: / 28-07-1997 / 19:09:16 / cg"
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   498
    "Modified (comment): / 14-09-2017 / 15:26:46 / stefan"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   499
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   500
a27a279701f8 Initial revision
claus
parents:
diff changeset
   501
- aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   502
    "return the difference of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   503
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   504
    "/ notice:
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   505
    "/ the following code handles some common cases,
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   506
    "/ and exists as an optimization, to speed up those cases.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   507
    "/ also notice, that checks for those cases must be inlinable without
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   508
    "/ a message send; otherwise double-dispatch is just as fast.
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   509
    "/
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   510
    "/ Conceptionally, (and for most other argument types),
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   511
    "/ mixed arithmetic is implemented by double dispatching
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   512
    "/ (see the message send at the bottom)
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   513
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   514
    (aNumber isMemberOf:SmallInteger) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   515
	^ self class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   516
		numerator:(numerator - (denominator * aNumber))
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   517
		denominator:denominator
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   518
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   519
    (aNumber isMemberOf:Float) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   520
	^ (numerator asFloat / denominator asFloat) - aNumber
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   521
    ].
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   522
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   523
    ^ aNumber differenceFromFraction:self
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   524
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   525
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   526
     (1/3) - (1/9)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   527
     (1/9) - (1/3)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   528
     (999/1000) - (1/1000)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   529
     (999/1000) - (1/1000000)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   530
     (999000/1000000) - (1/1000000)
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   531
    "
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   532
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
   533
    "Modified: 28.7.1997 / 19:09:11 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   534
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   535
a27a279701f8 Initial revision
claus
parents:
diff changeset
   536
/ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   537
    "return the quotient of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   538
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   539
    "/ notice:
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   540
    "/ the following code handles some common cases,
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   541
    "/ and exists as an optimization, to speed up those cases.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   542
    "/ also notice, that checks for those cases must be inlinable without
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   543
    "/ a message send; otherwise double-dispatch is just as fast.
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   544
    "/
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   545
    "/ Conceptionally, (and for most other argument types),
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   546
    "/ mixed arithmetic is implemented by double dispatching
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   547
    "/ (see the message send at the bottom)
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   548
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   549
    (aNumber isMemberOf:SmallInteger) ifTrue:[
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   550
        ^ self class
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   551
                numerator:numerator
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   552
                denominator:(denominator * aNumber)
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   553
    ].
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   554
    aNumber isFloat ifTrue:[
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   555
        ^ numerator / (denominator * aNumber)
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   556
    ].
6064
04bde2eeb749 comments about double dispatching
Claus Gittinger <cg@exept.de>
parents: 6063
diff changeset
   557
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   558
    ^ aNumber quotientFromFraction:self
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   559
22254
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   560
    "Modified: / 28-07-1997 / 19:09:06 / cg"
30d452a7c004 #TUNING by stefan
Stefan Vogel <sv@exept.de>
parents: 22099
diff changeset
   561
    "Modified: / 14-09-2017 / 15:24:48 / stefan"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   562
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   563
a27a279701f8 Initial revision
claus
parents:
diff changeset
   564
// aNumber
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   565
    "return the integer quotient of dividing the receiver by aNumber with
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   566
     truncation towards negative infinity."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   567
a27a279701f8 Initial revision
claus
parents:
diff changeset
   568
    ^ (numerator * aNumber denominator) // (denominator * aNumber numerator)
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   569
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   570
    "
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   571
     0.5 // 1
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   572
     -0.5 // 1
3984
45a76e2f4236 Fix so that // and \\ truncate towards negative infinity and
Stefan Vogel <sv@exept.de>
parents: 3899
diff changeset
   573
     (1/2) // 1  = 0 ifFalse:[self halt].
45a76e2f4236 Fix so that // and \\ truncate towards negative infinity and
Stefan Vogel <sv@exept.de>
parents: 3899
diff changeset
   574
     (-1/2) // 1 = -1 ifFalse:[self halt].
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   575
    "
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   576
3984
45a76e2f4236 Fix so that // and \\ truncate towards negative infinity and
Stefan Vogel <sv@exept.de>
parents: 3899
diff changeset
   577
    "Modified: / 5.11.1996 / 11:47:14 / cg"
45a76e2f4236 Fix so that // and \\ truncate towards negative infinity and
Stefan Vogel <sv@exept.de>
parents: 3899
diff changeset
   578
    "Modified: / 13.2.1998 / 09:15:35 / stefan"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   579
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   580
a27a279701f8 Initial revision
claus
parents:
diff changeset
   581
negated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   582
    "optional - could use inherited method ..."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   583
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   584
    "/ no need to reduce - I am already
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   585
    ^ self class basicNew
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   586
	setNumerator:(numerator negated)
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   587
	denominator:denominator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   588
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   589
    "Modified: 5.11.1996 / 10:29:11 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   590
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   591
a27a279701f8 Initial revision
claus
parents:
diff changeset
   592
reciprocal
a27a279701f8 Initial revision
claus
parents:
diff changeset
   593
    "optional - could use inherited method ..."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   594
a27a279701f8 Initial revision
claus
parents:
diff changeset
   595
    numerator == 1 ifTrue:[^ denominator].
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   596
    "/ no need to reduce - I am already
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   597
    ^ self class basicNew
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   598
	setNumerator:denominator
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   599
	denominator:numerator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   600
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   601
    "Modified: 5.11.1996 / 10:29:22 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   602
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   603
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   604
!Fraction methodsFor:'coercing & converting'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   605
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   606
asFixedPoint
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   607
    "return the receiver as fixedPoint number.
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   608
     Q: what should the scale be here ?"
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   609
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   610
    ^ FixedPoint numerator:numerator denominator:denominator scale:2
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   611
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   612
    "
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   613
     (1/2) asFixedPoint
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   614
    "
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   615
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   616
    "Created: 5.11.1996 / 15:15:54 / cg"
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   617
!
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1878
diff changeset
   618
2140
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   619
asFixedPoint:scale
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   620
    "return the receiver as fixedPoint number, with the given number
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   621
     of post-decimal-point digits."
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   622
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   623
    ^ FixedPoint numerator:numerator denominator:denominator scale:scale
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   624
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   625
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   626
     (1/2) asFixedPoint:2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   627
     (1/3) asFixedPoint:2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   628
     (1/3) asFixedPoint:5
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   629
     (2/3) asFixedPoint:2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   630
     (2/3) asFixedPoint:5
2140
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   631
    "
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   632
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   633
    "Created: 5.11.1996 / 15:15:54 / cg"
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   634
    "Modified: 10.1.1997 / 19:54:50 / cg"
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   635
!
5e2def558185 added #asFixedPoint:
Claus Gittinger <cg@exept.de>
parents: 1893
diff changeset
   636
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   637
asFloat
11239
951d0e92ab3d comment
Claus Gittinger <cg@exept.de>
parents: 10486
diff changeset
   638
    "return a float with (approximately) my value.
951d0e92ab3d comment
Claus Gittinger <cg@exept.de>
parents: 10486
diff changeset
   639
     Since floats have a limited precision, you usually loose bits when doing this."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   640
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   641
    |num den numShift denShift bits rslt|
6571
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   642
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   643
    (numerator class == SmallInteger and:[denominator class == SmallInteger]) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   644
	^ (numerator asFloat) / (denominator asFloat)
6571
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   645
    ].
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   646
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   647
    "Do it the hard way: reduce magnitude and undo reduction on the quotient"
6571
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   648
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   649
    bits := Float precision * 2.    "number of bits to preserve (conservative)"
6571
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   650
    num := numerator abs.
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   651
    numShift := bits - num highBit. "(num highBit - bits) negated"
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   652
    numShift < 0 ifTrue:[num := num bitShift:numShift] ifFalse:[numShift := 0].
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   653
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   654
    den :=  denominator.
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   655
    denShift := bits - den highBit. "(den highBit - bits) negated"
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   656
    denShift < 0 ifTrue:[den := den bitShift:denShift] ifFalse:[denShift := 0].
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   657
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   658
    rslt := (num asFloat / den asFloat) * (2 raisedToInteger:denShift-numShift).
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   659
    numerator negative ifTrue:[ ^ rslt negated ].
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   660
    ^ rslt.
6571
101905a14870 Fix #asFloat for non-trivial Fractions
Stefan Vogel <sv@exept.de>
parents: 6486
diff changeset
   661
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   662
    "
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   663
      (5/9) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   664
      (-5/9) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   665
      (500000000000/900000000000) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   666
      (-500000000000/900000000000) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   667
      (500000000000/9) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   668
      (5/900000000000) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   669
      89012345678901234567 asFloat / 123456789123456789 asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   670
      (89012345678901234567 / 123456789123456789) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   671
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   672
      (
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   673
       180338700661043257034670206806167960222709397862806840937993331366591676308781197477183367018067356365812757479444845320188679437752013593674158587947149815441890236037219685250845721864713487208757788709113534916165172927384095182655935222723385253851776639985379367854545495930551624041981995105743408203125
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   674
	/
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   675
       180331613628627651967947866455016278082980736719853750685591387625058011528928110602436691256100991596843001549483950600930062886280582766771424470965440873615557144641435276844465734361353086032476712374317224249252177316815544331763696909434844464464323192083930469387098582956241443753242492675781250
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   676
      ) asFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   677
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   678
      180338700661043257034670206806167960222709397862806840937993331366591676308781197477183367018067356365812757479444845320188679437752013593674158587947149815441890236037219685250845721864713487208757788709113534916165172927384095182655935222723385253851776639985379367854545495930551624041981995105743408203125
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   679
	 asFloat /
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   680
      180331613628627651967947866455016278082980736719853750685591387625058011528928110602436691256100991596843001549483950600930062886280582766771424470965440873615557144641435276844465734361353086032476712374317224249252177316815544331763696909434844464464323192083930469387098582956241443753242492675781250
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   681
	 asFloat
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   682
    "
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   683
!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   684
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   685
asFraction
20416
dc0f91c47688 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20308
diff changeset
   686
    "return the receiver as fraction - that's the receiver itself"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   687
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   688
    ^ self
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   689
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   690
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   691
asInteger
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   692
    "return an integer with my value - will usually truncate"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   693
a27a279701f8 Initial revision
claus
parents:
diff changeset
   694
    ^ numerator // denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   695
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   696
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   697
asLargeFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   698
    "return a large float with (approximately) my value"
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   699
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   700
    ^ (numerator asLargeFloat) / (denominator asLargeFloat)
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   701
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   702
    "
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   703
      (5/9) asLargeFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   704
      (500000000000/900000000000) asLargeFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   705
      (500000000000/9) asLargeFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   706
    "
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   707
!
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   708
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   709
asLargeInteger
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   710
    "return an integer with my value - will usually truncate"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   711
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   712
    ^ self asInteger asLargeInteger
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   713
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   714
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   715
asLongFloat
15278
ddf05cd996da class: Fraction
Claus Gittinger <cg@exept.de>
parents: 13357
diff changeset
   716
    "return a long float with (approximately) my value.
ddf05cd996da class: Fraction
Claus Gittinger <cg@exept.de>
parents: 13357
diff changeset
   717
     Since floats have a limited precision, you usually loose bits when doing this."
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   718
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   719
    |num den numShift denShift numBits rslt|
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   720
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   721
    (numerator class == SmallInteger and:[denominator class == SmallInteger]) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   722
	^ (numerator asLongFloat) / (denominator asLongFloat)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   723
    ].
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   724
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   725
    "Do it the hard way: reduce magnitude and undo reduction on the quotient"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   726
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   727
    numBits := LongFloat precision * 2.    "number of bits to preserve (conservative)"
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   728
    num := numerator abs.
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   729
    numShift := numBits - num highBit. "(num highBit - bits) negated"
15278
ddf05cd996da class: Fraction
Claus Gittinger <cg@exept.de>
parents: 13357
diff changeset
   730
    numShift < 0 ifTrue:[num := num bitShift:numShift] ifFalse:[ numShift := 0].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   731
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   732
    den :=  denominator.
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   733
    denShift := numBits - den highBit. "(den highBit - bits) negated"
15278
ddf05cd996da class: Fraction
Claus Gittinger <cg@exept.de>
parents: 13357
diff changeset
   734
    denShift < 0 ifTrue:[den := den bitShift:denShift] ifFalse:[denShift := 0].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   735
7730
dda82553acc7 make #asLongFloat return a LongFloat (returned Float)
Stefan Vogel <sv@exept.de>
parents: 7571
diff changeset
   736
    rslt := (num asLongFloat / den asLongFloat) * (2 raisedToInteger:denShift-numShift).
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   737
    numerator negative ifTrue:[ ^ rslt negated ].
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   738
    ^ rslt.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   739
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   740
    "
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   741
      (5/9) asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   742
      (-5/9) asLongFloat
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   743
      (Fraction basicNew setNumerator:500000000000 denominator:900000000000) asLongFloat = (5/9) asLongFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   744
      (Fraction basicNew setNumerator:500000000001 denominator:900000000000) asLongFloat = (5/9) asLongFloat
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   745
      (500000000001/900000000000) asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   746
      (-500000000001/900000000000) asLongFloat
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   747
      (500000000001/900000000000) asLongFloat = (5/9) asLongFloat
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
   748
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   749
      (500000000000/9) asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   750
      (5/900000000000) asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   751
      89012345678901234567 asFloat / 123456789123456789 asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   752
      (89012345678901234567 / 123456789123456789) asLongFloat
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   753
      (-89012345678901234567 / 123456789123456789) asLongFloat
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   754
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   755
      (
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   756
       180338700661043257034670206806167960222709397862806840937993331366591676308781197477183367018067356365812757479444845320188679437752013593674158587947149815441890236037219685250845721864713487208757788709113534916165172927384095182655935222723385253851776639985379367854545495930551624041981995105743408203125
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   757
	/
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   758
       180331613628627651967947866455016278082980736719853750685591387625058011528928110602436691256100991596843001549483950600930062886280582766771424470965440873615557144641435276844465734361353086032476712374317224249252177316815544331763696909434844464464323192083930469387098582956241443753242492675781250
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   759
      ) asLongFloat
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   760
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   761
      180338700661043257034670206806167960222709397862806840937993331366591676308781197477183367018067356365812757479444845320188679437752013593674158587947149815441890236037219685250845721864713487208757788709113534916165172927384095182655935222723385253851776639985379367854545495930551624041981995105743408203125
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   762
	 asLongFloat /
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   763
      180331613628627651967947866455016278082980736719853750685591387625058011528928110602436691256100991596843001549483950600930062886280582766771424470965440873615557144641435276844465734361353086032476712374317224249252177316815544331763696909434844464464323192083930469387098582956241443753242492675781250
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   764
	 asLongFloat
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   765
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   766
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   767
1200
cc16f7a00b52 limited shortFloat support
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   768
asShortFloat
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   769
    "return a short float with (approximately) my value"
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   770
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   771
    (numerator class == SmallInteger and:[denominator class == SmallInteger]) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   772
	^ (numerator asShortFloat) / (denominator asShortFloat)
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   773
    ].
1200
cc16f7a00b52 limited shortFloat support
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   774
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   775
    ^ self asFloat asShortFloat
1200
cc16f7a00b52 limited shortFloat support
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   776
6576
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   777
    "
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   778
      (5/9) asShortFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   779
      (500000000000/900000000000) asShortFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   780
      (500000000000/9) asShortFloat
c28cdeb0bfb0 Fix asFloat
Stefan Vogel <sv@exept.de>
parents: 6571
diff changeset
   781
    "
1200
cc16f7a00b52 limited shortFloat support
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   782
!
cc16f7a00b52 limited shortFloat support
Claus Gittinger <cg@exept.de>
parents: 1133
diff changeset
   783
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   784
coerce:aNumber
18839
aa7721c46f4e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18240
diff changeset
   785
    "convert the argument aNumber into an instance of the receiver's class and return it."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   786
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   787
    ^ aNumber asFraction
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   788
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   789
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   790
generality
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   791
    "return the generality value - see ArithmeticValue>>retry:coercing:"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   792
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   793
    ^ 60
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   794
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   795
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   796
!Fraction methodsFor:'comparing'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   797
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   798
< aNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   799
    "return true if the receiver is less
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   800
     than aNumber, false otherwise."
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   801
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   802
    (aNumber isMemberOf:SmallInteger) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   803
	^ numerator < (denominator * aNumber)
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   804
    ].
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   805
    ^ aNumber lessFromFraction:self
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   806
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   807
    "Modified: 5.11.1996 / 10:30:52 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   808
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   809
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   810
= aNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   811
    "return true, if the argument represents the same numeric value
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   812
     as the receiver, false otherwise"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   813
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   814
    (aNumber isMemberOf:SmallInteger) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   815
	(denominator == 1) ifFalse:[
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   816
	    ^ numerator = (aNumber * denominator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   817
	].
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   818
	^ numerator = aNumber
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   819
    ].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   820
    ^ aNumber equalFromFraction:self
3631
26a44b284912 handle largeInteger case in Fraction =
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   821
26a44b284912 handle largeInteger case in Fraction =
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   822
    "Modified: / 7.7.1998 / 17:17:07 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   823
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   824
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   825
> aNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   826
    "return true if the receiver is greater
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   827
     than aNumber, false otherwise."
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   828
    "optional - could use inherited method ..."
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   829
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   830
    (aNumber isMemberOf:SmallInteger) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   831
	^ numerator > (denominator * aNumber)
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   832
    ].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   833
    ^ aNumber < self
4593
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   834
!
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   835
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   836
hash
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   837
    "return a number for hashing; redefined, since fractions compare
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   838
     by numeric value (i.e. (1/2) = 0.5), hash values must be the same"
4593
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   839
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   840
    (denominator == 1) ifTrue:[^ numerator hash].
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   841
    (denominator == -1) ifTrue:[^ numerator hash negated].
4594
eb09f567a3bc float, shortFloat and fraction all hash alike
Claus Gittinger <cg@exept.de>
parents: 4593
diff changeset
   842
    ^ self asFloat hash
4593
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   843
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   844
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   845
     3 hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   846
     (9/3) hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   847
     3.0 hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   848
     (1/2) hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   849
     (1/4) hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   850
     0.0 hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   851
     0.5 hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   852
     0.25 hash
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   853
     0.4 hash
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   854
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   855
     0.25 hash
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   856
     -0.25 hash
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   857
     (1/4) hash
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   858
     (-1/4) hash
4593
1023fa0c779e *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 3984
diff changeset
   859
    "
5364
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   860
!
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   861
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   862
sameFractionValueAs:aNumber
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   863
    "return true, if the argument represents the same numeric value
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   864
     as the receiver, false otherwise"
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   865
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   866
    |rSelf rNum|
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   867
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   868
    rSelf := self reduced.
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   869
    rNum := aNumber reduced.
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   870
    rSelf denominator = rNum denominator ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   871
	^ rSelf numerator = rNum numerator
5364
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   872
    ].
a27f5167822c *** empty log message ***
ps
parents: 5322
diff changeset
   873
    ^ false
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   874
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   875
a27a279701f8 Initial revision
claus
parents:
diff changeset
   876
!Fraction methodsFor:'double dispatching'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   877
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   878
differenceFromFixedPoint:aFixedPoint
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   879
    |n d otherDenominator otherNumerator|
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   880
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   881
    otherDenominator := aFixedPoint denominator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   882
    otherNumerator := aFixedPoint numerator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   883
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   884
    "save a multiplication if possible"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   885
    otherDenominator == denominator ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   886
	n := otherNumerator - numerator.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   887
	d := otherDenominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   888
    ] ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   889
	n := (otherNumerator * denominator) - (numerator * otherDenominator).
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   890
	d := otherDenominator * denominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   891
    ].
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   892
    ^ aFixedPoint class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   893
	numerator:n
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   894
	denominator:d
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   895
	scale:(aFixedPoint scale)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   896
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   897
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   898
     ((1/3) asFixedPoint:2) - (1/3)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   899
     ((1/3) asFixedPoint:2) - (2/3)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   900
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   901
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   902
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   903
differenceFromFloat:aFloat
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   904
    "sent when a float does not know how to subtract the receiver, a fraction"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   905
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   906
    ^ (aFloat * denominator - numerator) / denominator
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   907
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   908
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   909
differenceFromFraction:aFraction
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   910
    |n d otherDenominator otherNumerator|
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   911
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   912
    otherDenominator := aFraction denominator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   913
    otherNumerator := aFraction numerator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   914
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   915
    "save a multiplication if possible"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   916
    otherDenominator == denominator ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   917
	n := otherNumerator - numerator.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   918
	d := otherDenominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   919
    ] ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   920
	n := (otherNumerator * denominator) - (numerator * otherDenominator).
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   921
	d := otherDenominator * denominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   922
    ].
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   923
    ^ aFraction class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   924
	numerator:n
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   925
	denominator:d
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   926
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   927
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   928
     ((1/3) asFixedPoint:2) - (1/3)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   929
     ((1/3) asFixedPoint:2) - (2/3)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   930
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   931
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   932
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   933
differenceFromInteger:anInteger
213
3b56a17534fd *** empty log message ***
claus
parents: 92
diff changeset
   934
    "sent when an integer does not know how to subtract the receiver, a fraction"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   935
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   936
    ^ self class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   937
	numerator:((anInteger * denominator) - numerator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   938
	denominator:denominator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
   939
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
   940
    "Modified: 28.7.1997 / 19:08:53 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   941
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   942
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   943
equalFromFraction:aFraction
7571
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   944
    denominator = aFraction denominator ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   945
	^ false   " must always be reduced "
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   946
	"/ ^ (numerator * aFraction denominator) = (aFraction numerator * denominator)
7571
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   947
    ].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   948
    ^ numerator = aFraction numerator
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   949
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   950
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   951
equalFromInteger:anInteger
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   952
    "sent when an integer does not know how to compare to the receiver, a fraction"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   953
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   954
    "as I am always reduced, this test should not be required.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   955
     However, it is here for subclasses and to allow comparing unnormalized fractions,
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   956
     which might be encountered internally"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   957
7571
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   958
    denominator = 1 ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   959
	^ numerator = (anInteger * denominator)
7571
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   960
    ].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   961
    ^ numerator = anInteger
7571
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   962
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   963
    "
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   964
     1 = (1 asFixedPoint:1)
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   965
     (1 asFixedPoint:1) = 1
57d86ad2aded fixed comparing agains integer for subclasses
Claus Gittinger <cg@exept.de>
parents: 7442
diff changeset
   966
    "
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   967
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   968
10486
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   969
lessEqFromInteger:anInteger
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   970
    "sent when an integer does not know how to compare to the receiver, a fraction"
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   971
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   972
    ^ (denominator * anInteger) <= numerator
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   973
!
ecab71364dab new: #lessEqFromInteger:
Stefan Vogel <sv@exept.de>
parents: 8913
diff changeset
   974
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   975
lessFromFraction:aFraction
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   976
    "sent when a fraction does not know how to compare to the receiver.
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   977
     Return true if aFraction < self."
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   978
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   979
    |n d|
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   980
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   981
    d := aFraction denominator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   982
    n := aFraction numerator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   983
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   984
    "/ save a multiplication if possible
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   985
    d == denominator ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
   986
	^ n < numerator
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   987
    ].
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   988
    ^ (denominator * n) < (numerator * d)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   989
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   990
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   991
lessFromInteger:anInteger
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   992
    "sent when an integer does not know how to compare to the receiver, a fraction.
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
   993
     Return true if anInteger < self."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   994
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   995
    ^ (denominator * anInteger) < numerator
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   996
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   997
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
   998
productFromFixedPoint:aFixedPoint
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
   999
    ^ aFixedPoint class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1000
	numerator:(aFixedPoint numerator * numerator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1001
	denominator:(aFixedPoint denominator * denominator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1002
	scale:(aFixedPoint scale)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1003
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1004
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1005
     ((1/3) asFixedPoint:2) * 2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1006
     ((1/3) asFixedPoint:2) * (1/2)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1007
     ((1/3) asFixedPoint:2) * (3/2)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1008
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1009
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1010
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1011
productFromFloat:aFloat
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1012
    "sent when a float does not know how to multiply the receiver, a fraction"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1013
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1014
    ^ aFloat * numerator / denominator
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1015
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1016
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1017
productFromFraction:aFraction
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1018
    ^ aFraction class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1019
	numerator:(aFraction numerator * numerator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1020
	denominator:(aFraction denominator * denominator)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1021
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1022
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1023
     ((1/3) asFixedPoint:2) * 2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1024
     ((1/3) asFixedPoint:2) * (1/2)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1025
     ((1/3) asFixedPoint:2) * (3/2)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1026
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1027
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1028
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1029
productFromInteger:anInteger
213
3b56a17534fd *** empty log message ***
claus
parents: 92
diff changeset
  1030
    "sent when an integer does not know how to multiply the receiver, a fraction"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1031
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1032
    ^ self class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1033
	numerator:(anInteger * numerator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1034
	denominator:denominator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1035
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
  1036
    "Modified: 28.7.1997 / 19:06:22 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1037
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1038
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1039
quotientFromFixedPoint:aFixedPoint
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1040
    "Return the quotient of the argument, aFixedPoint and the receiver.
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1041
     Sent when aFixedPoint does not know how to divide by the receiver."
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1042
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1043
    ^ aFixedPoint class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1044
	numerator:(aFixedPoint numerator * denominator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1045
	denominator:(aFixedPoint denominator * numerator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1046
	scale:(aFixedPoint scale)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1047
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1048
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1049
     ((1/3) asFixedPoint:2) / 2
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1050
     ((1/3) asFixedPoint:2) / (1/2)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1051
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1052
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1053
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1054
quotientFromFloat:aFloat
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1055
    "Return the quotient of the argument, aFloat and the receiver.
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1056
     Sent when aFloat does not know how to divide by the receiver."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1057
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1058
    ^ (aFloat * denominator) / numerator
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1059
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1060
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1061
quotientFromFraction:aFraction
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1062
    "Return the quotient of the argument, aFraction and the receiver.
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1063
     Sent when aFraction does not know how to divide by the receiver."
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1064
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1065
    ^ aFraction class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1066
	numerator:(aFraction numerator * denominator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1067
	denominator:(aFraction denominator * numerator)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1068
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1069
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1070
     (1/3) / (1/2)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1071
     (1/3) / (3/2)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1072
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1073
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1074
324
290cfb34ec93 *** empty log message ***
claus
parents: 302
diff changeset
  1075
quotientFromInteger:anInteger
7442
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1076
    "Return the quotient of the argument, anInteger and the receiver.
1b0a20747a64 double dispatching
Claus Gittinger <cg@exept.de>
parents: 7403
diff changeset
  1077
     Sent when anInteger does not know how to divide by the receiver."
324
290cfb34ec93 *** empty log message ***
claus
parents: 302
diff changeset
  1078
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1079
    ^ self class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1080
	numerator:(anInteger * denominator)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1081
	denominator:numerator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1082
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
  1083
    "Modified: 28.7.1997 / 19:08:46 / cg"
324
290cfb34ec93 *** empty log message ***
claus
parents: 302
diff changeset
  1084
!
290cfb34ec93 *** empty log message ***
claus
parents: 302
diff changeset
  1085
22099
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1086
raisedFromFloat:aFloat
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1087
    "aFloat does not know how to be raised to the receiver"
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1088
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1089
    numerator == 1 ifTrue:[
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1090
        ^ aFloat nthRoot:denominator
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1091
    ].
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1092
    ^ self asFloat raisedFromFloat:aFloat
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1093
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1094
    "
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1095
     100 raisedTo:(2/5) asFloat
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1096
     100 raisedTo:(1/5) asFloat
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1097
     
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1098
     100 nthRoot:2      10.0
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1099
     100 nthRoot:3      4.641588833612778893
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1100
     100 raisedTo:(1/3) 3.16227766016838
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1101
     100 raisedTo:(1/4) 3.16227766016838
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1102
     100 raisedTo:(1/5) 2.51188643150958
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1103
     100 raisedTo:(1/6) 2.15443469003188
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1104
     100 raisedTo:(1/7) 1.93069772888325
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1105
    "
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1106
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1107
    "Created: / 25-07-2017 / 16:13:26 / cg"
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1108
!
cc9d508cf69c #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 21974
diff changeset
  1109
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1110
sumFromFixedPoint:aFixedPoint
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1111
    |n d otherDenominator otherNumerator|
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1112
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1113
    otherDenominator := aFixedPoint denominator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1114
    otherNumerator := aFixedPoint numerator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1115
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1116
    "save a multiplication if possible"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1117
    otherDenominator == denominator ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1118
	n := otherNumerator + numerator.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1119
	d := otherDenominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1120
    ] ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1121
	n := (otherNumerator * denominator) + (numerator * otherDenominator).
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1122
	d := otherDenominator * denominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1123
    ].
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1124
    ^ aFixedPoint class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1125
	numerator:n
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1126
	denominator:d
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1127
	scale:(aFixedPoint scale)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1128
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1129
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1130
     ((1/3) asFixedPoint:2) + (1/3)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1131
     ((1/3) asFixedPoint:2) + (2/3)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1132
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1133
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1134
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1135
sumFromFloat:aFloat
213
3b56a17534fd *** empty log message ***
claus
parents: 92
diff changeset
  1136
    "sent when a float does not know how to add the receiver, a fraction"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1137
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1138
    ^ (aFloat * denominator + numerator) / denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1139
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1140
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1141
sumFromFraction:aFraction
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1142
    |n d otherDenominator otherNumerator|
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1143
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1144
    otherDenominator := aFraction denominator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1145
    otherNumerator := aFraction numerator.
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1146
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1147
    "save a multiplication if possible"
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1148
    otherDenominator == denominator ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1149
	n := otherNumerator + numerator.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1150
	d := otherDenominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1151
    ] ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1152
	n := (otherNumerator * denominator) + (numerator * otherDenominator).
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1153
	d := otherDenominator * denominator.
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1154
    ].
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1155
    ^ aFraction class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1156
	numerator:n
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1157
	denominator:d
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1158
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1159
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1160
     (1/3) + (1/3)
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1161
     (1/3) + (2/3)
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1162
    "
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1163
!
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1164
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1165
sumFromInteger:anInteger
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1166
    "sent when an integer does not know how to add the receiver, a fraction"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1167
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1168
    ^ self class
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1169
	numerator:(numerator + (anInteger * denominator))
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1170
	denominator:denominator
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1171
2792
2ae1f2e3d11f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 2790
diff changeset
  1172
    "Modified: 28.7.1997 / 19:08:40 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1173
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1174
22895
711322e64257 #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 22608
diff changeset
  1175
92
0c73b48551ac *** empty log message ***
claus
parents: 88
diff changeset
  1176
!Fraction methodsFor:'printing & storing'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1177
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1178
printOn:aStream
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1179
    "append a printed representation of the receiver to the
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1180
     argument, aStream"
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1181
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1182
    |t|
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1183
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1184
    PrintWholeNumbers == true ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1185
	"/ experimental: print fractions which are greater than 1 as a sum of
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1186
	"/ an integral and the fractional part. They are easier to read this way.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1187
	numerator > denominator ifTrue:[
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1188
	    aStream nextPut:$(.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1189
	    t := numerator // denominator.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1190
	    t printOn:aStream.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1191
	    aStream nextPutAll:'+('.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1192
	    (numerator - (t*denominator)) printOn:aStream.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1193
	    aStream nextPut:$/.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1194
	    denominator printOn:aStream.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1195
	    aStream nextPutAll:'))'.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1196
	    ^ self
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1197
	].
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1198
    ].
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1199
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1200
    aStream nextPut:$(.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1201
    numerator printOn:aStream.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1202
    aStream nextPut:$/.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1203
    denominator printOn:aStream.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
  1204
    aStream nextPut:$)
6675
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1205
c7e2757d5e80 documentation comment
Claus Gittinger <cg@exept.de>
parents: 6650
diff changeset
  1206
    "Modified: / 31.7.2002 / 09:56:41 / cg"
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
  1207
! !
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1208
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1209
!Fraction methodsFor:'private'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1210
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1211
reduced
7139
958ca5839e25 comment
Claus Gittinger <cg@exept.de>
parents: 6891
diff changeset
  1212
    "reduce the receiver; divide the numerator and denominator by their
958ca5839e25 comment
Claus Gittinger <cg@exept.de>
parents: 6891
diff changeset
  1213
     greatest common divisor; if the result is integral, return an Integer.
958ca5839e25 comment
Claus Gittinger <cg@exept.de>
parents: 6891
diff changeset
  1214
     Otherwise, return the normalized receiver.
11250
9a962a088d30 comment
Claus Gittinger <cg@exept.de>
parents: 11239
diff changeset
  1215
     CAVEAT: bad name; should be called reduce, as it has a side effect
9a962a088d30 comment
Claus Gittinger <cg@exept.de>
parents: 11239
diff changeset
  1216
     (i.e. this is destructive wrt. the instance values)."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1217
2790
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1218
    |gcd den|
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1219
2790
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1220
    den := denominator.
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1221
    den < 0 ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1222
	numerator := numerator negated.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1223
	den := denominator := den negated.
2789
e3e8707d26b4 make certain, that denominator is positive (in #reduce)
Claus Gittinger <cg@exept.de>
parents: 2140
diff changeset
  1224
    ].
e3e8707d26b4 make certain, that denominator is positive (in #reduce)
Claus Gittinger <cg@exept.de>
parents: 2140
diff changeset
  1225
2790
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1226
    den == 1 ifTrue:[^ numerator].
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1227
    numerator == 1 ifTrue:[^ self].
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1228
    numerator == 0 ifTrue:[^ 0].
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1229
2790
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1230
    gcd := numerator gcd:den.
495b8ea6a4cb *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2789
diff changeset
  1231
    (gcd ~~ 1) ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1232
	gcd < 0 ifTrue:[
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1233
	     gcd := gcd negated.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1234
	].
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1235
	numerator := numerator // gcd.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1236
	denominator := den := den // gcd.
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1237
	(den == 1) ifTrue:[^ numerator].
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1238
    ].
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1239
    ^ self
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1240
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1241
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1242
setNumerator:num denominator:den
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1243
    "set both numerator and denominator"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1244
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1245
    numerator := num.
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1246
    denominator := den
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1247
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1248
6650
35de1d8400b2 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 6646
diff changeset
  1249
!Fraction methodsFor:'testing'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1250
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1251
isFraction
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1252
    "return true, if the receiver is some kind of fraction;
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1253
     true is returned here - the method is redefined from Object."
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1254
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1255
    ^ true
6650
35de1d8400b2 *** empty log message ***
Stefan Vogel <sv@exept.de>
parents: 6646
diff changeset
  1256
!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1257
4658
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1258
isLiteral
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1259
    "return true, if the receiver can be used as a literal constant in ST syntax
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1260
     (i.e. can be used in constant arrays)"
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1261
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1262
    ^ true
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1263
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1264
!
1a74754fbe91 moved isLiteral (complex and FixedPoint are not)
Claus Gittinger <cg@exept.de>
parents: 4594
diff changeset
  1265
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1266
negative
18861
01abf9837590 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18839
diff changeset
  1267
    "return true if the receiver is less than zero"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1268
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1269
    (numerator < 0) ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 19261
diff changeset
  1270
	^ (denominator < 0) not
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1271
    ].
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1272
    ^ (denominator < 0)
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1273
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1274
5552
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5364
diff changeset
  1275
!Fraction methodsFor:'truncation & rounding'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1276
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1277
fractionPart
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1278
    "extract the after-decimal fraction part,
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1279
     such that (self truncated + self fractionPart) = self"
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1280
6153
e92766db42c6 integerPart and fractionPart fixed for negative numbers
Claus Gittinger <cg@exept.de>
parents: 6064
diff changeset
  1281
    numerator abs < denominator abs ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1282
	^ self
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1283
    ].
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1284
    ^ (numerator rem: denominator) / denominator
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1285
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1286
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1287
     (3/2) fractionPart + (3/2) truncated
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1288
     (-3/2) fractionPart + (-3/2) truncated
7355
96f466eeddf5 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7140
diff changeset
  1289
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1290
     (3/2) fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1291
     (-3/2) fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1292
     (3/2) asFloat fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1293
     (-3/2) asFloat fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1294
     (2/3) fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1295
     ((3/2)*(15/4)) fractionPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1296
     ((2/3)*(4/15)) fractionPart
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1297
    "
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1298
6153
e92766db42c6 integerPart and fractionPart fixed for negative numbers
Claus Gittinger <cg@exept.de>
parents: 6064
diff changeset
  1299
    "Modified: / 5.11.2001 / 17:55:25 / cg"
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1300
!
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1301
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1302
integerPart
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1303
    "extract the pre-decimal integer part."
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1304
6153
e92766db42c6 integerPart and fractionPart fixed for negative numbers
Claus Gittinger <cg@exept.de>
parents: 6064
diff changeset
  1305
    numerator abs < denominator abs ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1306
	^ 0
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1307
    ].
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1308
    ^ super integerPart
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1309
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1310
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1311
     (3/2) integerPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1312
     (-3/2) integerPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1313
     (2/3) integerPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1314
     ((3/2)*(15/4)) integerPart
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1315
     ((2/3)*(4/15)) integerPart
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1316
    "
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1317
6153
e92766db42c6 integerPart and fractionPart fixed for negative numbers
Claus Gittinger <cg@exept.de>
parents: 6064
diff changeset
  1318
    "Modified: / 5.11.2001 / 17:55:01 / cg"
3899
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1319
!
aa9b50cdfced added #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3631
diff changeset
  1320
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1321
rounded
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1322
    "return the receiver rounded to the nearest integer as integer"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1323
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1324
    "/ mhmh - what about -(1/2)
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1325
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1326
    |t|
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1327
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1328
    self negative ifTrue:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1329
	t := self - (1/2)
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1330
    ] ifFalse:[
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1331
	t := self + (1/2)
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1332
    ].
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1333
    ^ t truncated.
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1334
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1335
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1336
     (1/3) rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1337
     (1/3) negated rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1338
     (1/2) rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1339
     (1/2) negated rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1340
     0.5 rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1341
     -0.5 rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1342
     (2/3) rounded
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1343
     (2/3) negated rounded
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1344
    "
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1345
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1346
    "Modified: 5.11.1996 / 11:32:32 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1347
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1348
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1349
truncated
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1350
    "return the receiver truncated towards zero as Integer"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1351
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1352
    ^ numerator quo: denominator
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1353
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1354
    "
18239
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1355
     (3/2) truncated
1f10572b7324 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 16938
diff changeset
  1356
     (3/2) negated truncated
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1357
    "
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1358
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1359
    "Modified: 5.11.1996 / 12:18:46 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1360
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1361
8395
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1362
!Fraction methodsFor:'visiting'!
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1363
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1364
acceptVisitor:aVisitor with:aParameter
16729
0cf2bfd45072 comment/format only
Claus Gittinger <cg@exept.de>
parents: 15278
diff changeset
  1365
    "dispatch for visitor pattern; send #visitFraction:with: to aVisitor"
8395
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1366
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1367
    ^ aVisitor visitFraction:self with:aParameter
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1368
! !
6bd97113cb4c Generalize visitor pattern and define #visit...:with: -methods instead
Stefan Vogel <sv@exept.de>
parents: 7859
diff changeset
  1369
1878
5615af5e7f47 fixed truncated & rounded for negative fractions
Claus Gittinger <cg@exept.de>
parents: 1556
diff changeset
  1370
!Fraction class methodsFor:'documentation'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1371
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1372
version
18839
aa7721c46f4e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18240
diff changeset
  1373
    ^ '$Header$'
13357
487c502b40b7 comment/format in: #pi
Claus Gittinger <cg@exept.de>
parents: 11901
diff changeset
  1374
!
487c502b40b7 comment/format in: #pi
Claus Gittinger <cg@exept.de>
parents: 11901
diff changeset
  1375
487c502b40b7 comment/format in: #pi
Claus Gittinger <cg@exept.de>
parents: 11901
diff changeset
  1376
version_CVS
18839
aa7721c46f4e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18240
diff changeset
  1377
    ^ '$Header$'
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1378
! !
6891
212aa8576cf7 oops - did not compare correctly against unnormalized numbers
Claus Gittinger <cg@exept.de>
parents: 6675
diff changeset
  1379
15278
ddf05cd996da class: Fraction
Claus Gittinger <cg@exept.de>
parents: 13357
diff changeset
  1380
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
  1381
Fraction initialize!