Fraction.st
author claus
Tue, 17 May 1994 12:09:46 +0200
changeset 77 6c38ca59927f
parent 54 06dbdeeed4f9
child 88 81dacba7a63a
permissions -rw-r--r--
*** empty log message ***
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     1
"
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
     2
 COPYRIGHT (c) 1989 by Claus Gittinger
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
     3
              All Rights Reserved
a27a279701f8 Initial revision
claus
parents:
diff changeset
     4
a27a279701f8 Initial revision
claus
parents:
diff changeset
     5
 This software is furnished under a license and may be used
a27a279701f8 Initial revision
claus
parents:
diff changeset
     6
 only in accordance with the terms of that license and with the
a27a279701f8 Initial revision
claus
parents:
diff changeset
     7
 inclusion of the above copyright notice.   This software may not
a27a279701f8 Initial revision
claus
parents:
diff changeset
     8
 be provided or otherwise made available to, or used by, any
a27a279701f8 Initial revision
claus
parents:
diff changeset
     9
 other person.  No title to or ownership of the software is
a27a279701f8 Initial revision
claus
parents:
diff changeset
    10
 hereby transferred.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    11
"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    12
a27a279701f8 Initial revision
claus
parents:
diff changeset
    13
Number subclass:#Fraction
a27a279701f8 Initial revision
claus
parents:
diff changeset
    14
       instanceVariableNames:'numerator denominator'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    15
       classVariableNames:'FractionOne FractionZero'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    16
       poolDictionaries:''
a27a279701f8 Initial revision
claus
parents:
diff changeset
    17
       category:'Magnitude-Numbers'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    18
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    19
a27a279701f8 Initial revision
claus
parents:
diff changeset
    20
Fraction comment:'
a27a279701f8 Initial revision
claus
parents:
diff changeset
    21
5
67342904af11 *** empty log message ***
claus
parents: 3
diff changeset
    22
COPYRIGHT (c) 1989 by Claus Gittinger
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
              All Rights Reserved
a27a279701f8 Initial revision
claus
parents:
diff changeset
    24
77
6c38ca59927f *** empty log message ***
claus
parents: 54
diff changeset
    25
$Header: /cvs/stx/stx/libbasic/Fraction.st,v 1.9 1994-05-17 10:07:40 claus Exp $
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    26
'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    27
a27a279701f8 Initial revision
claus
parents:
diff changeset
    28
!Fraction class methodsFor:'initialization'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    29
a27a279701f8 Initial revision
claus
parents:
diff changeset
    30
initialize
a27a279701f8 Initial revision
claus
parents:
diff changeset
    31
    FractionZero := self numerator:0 denominator:1.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    32
    FractionOne := self numerator:1 denominator:1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    33
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
    34
a27a279701f8 Initial revision
claus
parents:
diff changeset
    35
!Fraction class methodsFor:'constants'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    36
a27a279701f8 Initial revision
claus
parents:
diff changeset
    37
zero
44
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
    38
    "return the neutral element for addition"
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
    39
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    40
    ^ FractionZero
a27a279701f8 Initial revision
claus
parents:
diff changeset
    41
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    42
a27a279701f8 Initial revision
claus
parents:
diff changeset
    43
unity
44
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
    44
    "return the neutral element for multiplication"
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
    45
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    46
    ^ FractionOne
a27a279701f8 Initial revision
claus
parents:
diff changeset
    47
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
    48
a27a279701f8 Initial revision
claus
parents:
diff changeset
    49
!Fraction class methodsFor:'instance creation'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    50
a27a279701f8 Initial revision
claus
parents:
diff changeset
    51
new
a27a279701f8 Initial revision
claus
parents:
diff changeset
    52
    "create and return a new fraction with value 0"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    53
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
    54
    ^ self numerator:0 denominator:1
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    55
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    56
a27a279701f8 Initial revision
claus
parents:
diff changeset
    57
numerator:num denominator:den
a27a279701f8 Initial revision
claus
parents:
diff changeset
    58
    "create and return a new fraction with numerator num and denominator den"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    59
a27a279701f8 Initial revision
claus
parents:
diff changeset
    60
%{  /* NOCONTEXT */
13
62303f84ff5f *** empty log message ***
claus
parents: 5
diff changeset
    61
    /* this check allows subclassing .. */
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    62
    if (self == Fraction) {
77
6c38ca59927f *** empty log message ***
claus
parents: 54
diff changeset
    63
        if (_CanDoQuickAlignedNew(sizeof(struct fractionstruct))) {
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    64
            OBJ newFraction;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    65
77
6c38ca59927f *** empty log message ***
claus
parents: 54
diff changeset
    66
            _qCheckedAlignedNew(newFraction, sizeof(struct fractionstruct));
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    67
            _InstPtr(newFraction)->o_class = Fraction;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    68
            _FractionInstPtr(newFraction)->f_numerator = num;
a27a279701f8 Initial revision
claus
parents:
diff changeset
    69
            _FractionInstPtr(newFraction)->f_denominator = den;
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
    70
            __STORE(newFraction, num);
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
    71
            __STORE(newFraction, den);
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    72
            RETURN ( newFraction );
a27a279701f8 Initial revision
claus
parents:
diff changeset
    73
        }
a27a279701f8 Initial revision
claus
parents:
diff changeset
    74
    }
a27a279701f8 Initial revision
claus
parents:
diff changeset
    75
%}
a27a279701f8 Initial revision
claus
parents:
diff changeset
    76
.
a27a279701f8 Initial revision
claus
parents:
diff changeset
    77
    ^ self basicNew setNumerator:num denominator:den
a27a279701f8 Initial revision
claus
parents:
diff changeset
    78
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
    79
3
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    80
!Fraction class methodsFor:'queries'!
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    81
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    82
isBuiltInClass
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    83
    "this class is known by the run-time-system"
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    84
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    85
    ^ self == Fraction
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    86
! !
24d81bf47225 *** empty log message ***
claus
parents: 2
diff changeset
    87
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    88
!Fraction methodsFor:'accessing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    89
a27a279701f8 Initial revision
claus
parents:
diff changeset
    90
numerator
a27a279701f8 Initial revision
claus
parents:
diff changeset
    91
    "return the numerator"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    92
a27a279701f8 Initial revision
claus
parents:
diff changeset
    93
    ^ numerator
a27a279701f8 Initial revision
claus
parents:
diff changeset
    94
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    95
a27a279701f8 Initial revision
claus
parents:
diff changeset
    96
denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
    97
    "return the denominator"
a27a279701f8 Initial revision
claus
parents:
diff changeset
    98
a27a279701f8 Initial revision
claus
parents:
diff changeset
    99
    ^ denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   100
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   101
a27a279701f8 Initial revision
claus
parents:
diff changeset
   102
!Fraction methodsFor:'private'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   103
a27a279701f8 Initial revision
claus
parents:
diff changeset
   104
setNumerator:num denominator:den
a27a279701f8 Initial revision
claus
parents:
diff changeset
   105
    "set both numerator and denominator"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   106
a27a279701f8 Initial revision
claus
parents:
diff changeset
   107
    numerator := num.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   108
    denominator := den
a27a279701f8 Initial revision
claus
parents:
diff changeset
   109
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   110
a27a279701f8 Initial revision
claus
parents:
diff changeset
   111
reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   112
    "reduce the receiver"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   113
a27a279701f8 Initial revision
claus
parents:
diff changeset
   114
    |gc|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   115
a27a279701f8 Initial revision
claus
parents:
diff changeset
   116
    denominator == 1 ifTrue:[^ numerator].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   117
    numerator == 1 ifTrue:[^ self].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   118
a27a279701f8 Initial revision
claus
parents:
diff changeset
   119
    gc := numerator gcd:denominator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   120
    (gc == 1) ifFalse:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   121
        numerator := numerator // gc.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   122
        denominator := denominator // gc
a27a279701f8 Initial revision
claus
parents:
diff changeset
   123
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   124
    (numerator < 0) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   125
        (denominator < 0) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   126
            numerator := numerator negated.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   127
            denominator := denominator negated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   128
        ]
a27a279701f8 Initial revision
claus
parents:
diff changeset
   129
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   130
    (denominator == 1) ifTrue:[^ numerator].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   131
    ^ self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   132
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   133
a27a279701f8 Initial revision
claus
parents:
diff changeset
   134
!Fraction methodsFor:'coercing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   135
a27a279701f8 Initial revision
claus
parents:
diff changeset
   136
coerce:aNumber
44
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
   137
    "return aNumber converted into receivers type"
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
   138
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   139
    ^ aNumber asFraction
a27a279701f8 Initial revision
claus
parents:
diff changeset
   140
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   141
a27a279701f8 Initial revision
claus
parents:
diff changeset
   142
generality
44
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
   143
    "return the generality value - see ArithmeticValue>>retry:coercing:"
b262907c93ea *** empty log message ***
claus
parents: 16
diff changeset
   144
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   145
    ^ 60
a27a279701f8 Initial revision
claus
parents:
diff changeset
   146
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   147
a27a279701f8 Initial revision
claus
parents:
diff changeset
   148
!Fraction methodsFor:'converting'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   149
a27a279701f8 Initial revision
claus
parents:
diff changeset
   150
asInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   151
    "return an integer with my value - will usually truncate"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   152
a27a279701f8 Initial revision
claus
parents:
diff changeset
   153
    ^ numerator // denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   154
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   155
a27a279701f8 Initial revision
claus
parents:
diff changeset
   156
asLargeInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   157
    "return an integer with my value - will usually truncate"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   158
a27a279701f8 Initial revision
claus
parents:
diff changeset
   159
    ^ self asInteger asLargeInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   160
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   161
a27a279701f8 Initial revision
claus
parents:
diff changeset
   162
asFloat
a27a279701f8 Initial revision
claus
parents:
diff changeset
   163
    "return a float with (approximately) my value"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   164
a27a279701f8 Initial revision
claus
parents:
diff changeset
   165
    ^ (numerator asFloat) / (denominator asFloat)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   166
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   167
a27a279701f8 Initial revision
claus
parents:
diff changeset
   168
asFraction
a27a279701f8 Initial revision
claus
parents:
diff changeset
   169
    "return the receiver as fraction - thats itself"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   170
a27a279701f8 Initial revision
claus
parents:
diff changeset
   171
    ^ self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   172
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   173
a27a279701f8 Initial revision
claus
parents:
diff changeset
   174
!Fraction methodsFor:'comparing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   175
a27a279701f8 Initial revision
claus
parents:
diff changeset
   176
= aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   177
    "return true, if the argument represents the same numeric value
a27a279701f8 Initial revision
claus
parents:
diff changeset
   178
     as the receiver, false otherwise"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   179
a27a279701f8 Initial revision
claus
parents:
diff changeset
   180
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   181
        (denominator = 1) ifFalse:[^ false].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   182
        ^ numerator = aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   183
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   184
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   185
        (numerator = aNumber numerator) ifFalse:[^ false].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   186
        ^ denominator = aNumber denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   187
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   188
    ^ self retry:#= coercing:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   189
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   190
a27a279701f8 Initial revision
claus
parents:
diff changeset
   191
> aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   192
    "return true if the receiver is greater
a27a279701f8 Initial revision
claus
parents:
diff changeset
   193
     than aNumber, false otherwise."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   194
    "optional - could use inherited method ..."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   195
a27a279701f8 Initial revision
claus
parents:
diff changeset
   196
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   197
        ^ numerator > (denominator * aNumber)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   198
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   199
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   200
        ^ (numerator * aNumber denominator) > (denominator * aNumber numerator)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   201
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   202
    ^ self retry:#> coercing:aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   203
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   204
a27a279701f8 Initial revision
claus
parents:
diff changeset
   205
< aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   206
    "return true if the receiver is less
a27a279701f8 Initial revision
claus
parents:
diff changeset
   207
     than aNumber, false otherwise."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   208
a27a279701f8 Initial revision
claus
parents:
diff changeset
   209
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   210
        ^ numerator < (denominator * aNumber)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   211
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   212
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   213
        ^ (numerator * aNumber denominator) < (denominator * aNumber numerator)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   214
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   215
    ^ aNumber lessFromFraction:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   216
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   217
a27a279701f8 Initial revision
claus
parents:
diff changeset
   218
!Fraction methodsFor:'testing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   219
a27a279701f8 Initial revision
claus
parents:
diff changeset
   220
negative
a27a279701f8 Initial revision
claus
parents:
diff changeset
   221
    "return true if the receiver is negative"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   222
a27a279701f8 Initial revision
claus
parents:
diff changeset
   223
    (numerator < 0) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   224
        ^ (denominator < 0) not
a27a279701f8 Initial revision
claus
parents:
diff changeset
   225
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   226
    ^ (denominator < 0)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   227
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   228
a27a279701f8 Initial revision
claus
parents:
diff changeset
   229
!Fraction methodsFor:'arithmetic'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   230
a27a279701f8 Initial revision
claus
parents:
diff changeset
   231
+ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   232
    "return the sum of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   233
a27a279701f8 Initial revision
claus
parents:
diff changeset
   234
    |n d|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   235
a27a279701f8 Initial revision
claus
parents:
diff changeset
   236
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   237
        ^ (self class numerator:(numerator + (denominator * aNumber))
a27a279701f8 Initial revision
claus
parents:
diff changeset
   238
                    denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   239
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   240
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   241
        n := aNumber numerator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   242
        d := aNumber denominator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   243
a27a279701f8 Initial revision
claus
parents:
diff changeset
   244
        "save a multiplication if possible"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   245
        denominator == d ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   246
            ^ (self class numerator:(numerator + n) denominator:d) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   247
        ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   248
a27a279701f8 Initial revision
claus
parents:
diff changeset
   249
        ^ (self class numerator:((numerator * d) + (n * denominator))
a27a279701f8 Initial revision
claus
parents:
diff changeset
   250
                    denominator:(denominator * d)) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   251
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   252
    (aNumber isMemberOf:Float) ifTrue:[
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   253
        ^ aNumber + (numerator asFloat / denominator asFloat)
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   254
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   255
    ^ aNumber sumFromFraction:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   256
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   257
a27a279701f8 Initial revision
claus
parents:
diff changeset
   258
- aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   259
    "return the difference of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   260
a27a279701f8 Initial revision
claus
parents:
diff changeset
   261
    |n d|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   262
a27a279701f8 Initial revision
claus
parents:
diff changeset
   263
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   264
        ^ (self class numerator:(numerator - (denominator * aNumber))
a27a279701f8 Initial revision
claus
parents:
diff changeset
   265
                    denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   266
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   267
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   268
        n := aNumber numerator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   269
        d := aNumber denominator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   270
a27a279701f8 Initial revision
claus
parents:
diff changeset
   271
        "save a multiplication if possible"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   272
        denominator == d ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   273
            ^ (self class numerator:(numerator - n) denominator:d) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   274
        ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   275
a27a279701f8 Initial revision
claus
parents:
diff changeset
   276
        ^ (self class numerator:((numerator * d) - (n * denominator)) 
a27a279701f8 Initial revision
claus
parents:
diff changeset
   277
                    denominator:(denominator * d)) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   278
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   279
    (aNumber isMemberOf:Float) ifTrue:[
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   280
        ^ (numerator asFloat / denominator asFloat) - aNumber
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   281
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   282
    ^ aNumber differenceFromFraction:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   283
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   284
a27a279701f8 Initial revision
claus
parents:
diff changeset
   285
* aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   286
    "return the product of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   287
a27a279701f8 Initial revision
claus
parents:
diff changeset
   288
    |n d|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   289
a27a279701f8 Initial revision
claus
parents:
diff changeset
   290
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   291
        ^ (self class numerator:(numerator * aNumber)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   292
                    denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   293
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   294
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   295
        n := numerator * aNumber numerator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   296
        d := denominator * aNumber denominator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   297
        ^ (self class numerator:n denominator:d) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   298
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   299
    (aNumber isMemberOf:Float) ifTrue:[
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   300
        ^ (numerator * aNumber) / denominator
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   301
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   302
    ^ aNumber productFromFraction:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   303
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   304
a27a279701f8 Initial revision
claus
parents:
diff changeset
   305
/ aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   306
    "return the quotient of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   307
a27a279701f8 Initial revision
claus
parents:
diff changeset
   308
    |n d|
a27a279701f8 Initial revision
claus
parents:
diff changeset
   309
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   310
    (aNumber isMemberOf:SmallInteger) ifTrue:[
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   311
        ^ (self class numerator:numerator
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   312
                    denominator:(denominator * aNumber)) reduced
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   313
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   314
    (aNumber isKindOf:Fraction) ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   315
        n := numerator * aNumber denominator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   316
        d := denominator * aNumber numerator.
a27a279701f8 Initial revision
claus
parents:
diff changeset
   317
        ^ (self class numerator:n denominator:d) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   318
    ].
16
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   319
    (aNumber isMemberOf:Float) ifTrue:[
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   320
        ^ numerator / (denominator * aNumber)
a580032d04f6 *** empty log message ***
claus
parents: 13
diff changeset
   321
    ].
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   322
    ^ aNumber quotientFromFraction:self
a27a279701f8 Initial revision
claus
parents:
diff changeset
   323
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   324
a27a279701f8 Initial revision
claus
parents:
diff changeset
   325
// aNumber
a27a279701f8 Initial revision
claus
parents:
diff changeset
   326
    "return the integer quotient of the receiver and the argument, aNumber"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   327
a27a279701f8 Initial revision
claus
parents:
diff changeset
   328
    self negative ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   329
         ^ ((numerator * aNumber denominator) // (denominator * aNumber numerator)) - 1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   330
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   331
    ^ (numerator * aNumber denominator) // (denominator * aNumber numerator)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   332
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   333
a27a279701f8 Initial revision
claus
parents:
diff changeset
   334
negated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   335
    "optional - could use inherited method ..."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   336
a27a279701f8 Initial revision
claus
parents:
diff changeset
   337
    ^ self class numerator:(numerator negated)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   338
               denominator:denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   339
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   340
a27a279701f8 Initial revision
claus
parents:
diff changeset
   341
reciprocal
a27a279701f8 Initial revision
claus
parents:
diff changeset
   342
    "optional - could use inherited method ..."
a27a279701f8 Initial revision
claus
parents:
diff changeset
   343
a27a279701f8 Initial revision
claus
parents:
diff changeset
   344
    numerator == 1 ifTrue:[^ denominator].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   345
    ^ self class numerator:denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   346
               denominator:numerator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   347
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   348
a27a279701f8 Initial revision
claus
parents:
diff changeset
   349
!Fraction methodsFor:'truncation and rounding'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   350
a27a279701f8 Initial revision
claus
parents:
diff changeset
   351
truncated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   352
    "return the receiver truncated towards zero as Integer"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   353
a27a279701f8 Initial revision
claus
parents:
diff changeset
   354
    ^ numerator // denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   355
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   356
a27a279701f8 Initial revision
claus
parents:
diff changeset
   357
rounded
a27a279701f8 Initial revision
claus
parents:
diff changeset
   358
    "return the receiver rounded to the nearest integer as integer"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   359
a27a279701f8 Initial revision
claus
parents:
diff changeset
   360
    self negative ifTrue:[
a27a279701f8 Initial revision
claus
parents:
diff changeset
   361
        ^ (self + (1/2)) truncated - 1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   362
    ].
a27a279701f8 Initial revision
claus
parents:
diff changeset
   363
    ^ (self + (1/2)) truncated
a27a279701f8 Initial revision
claus
parents:
diff changeset
   364
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   365
a27a279701f8 Initial revision
claus
parents:
diff changeset
   366
!Fraction methodsFor:'double dispatching'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   367
a27a279701f8 Initial revision
claus
parents:
diff changeset
   368
sumFromInteger:anInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   369
    "sent when an integer does not know how to add the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   370
a27a279701f8 Initial revision
claus
parents:
diff changeset
   371
    ^ (self class numerator:(numerator + (anInteger * denominator))
a27a279701f8 Initial revision
claus
parents:
diff changeset
   372
                denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   373
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   374
a27a279701f8 Initial revision
claus
parents:
diff changeset
   375
differenceFromInteger:anInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   376
    "sent when an integer does not know how to subtract the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   377
a27a279701f8 Initial revision
claus
parents:
diff changeset
   378
    ^ (self class numerator:((anInteger * denominator) - numerator)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   379
                denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   380
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   381
a27a279701f8 Initial revision
claus
parents:
diff changeset
   382
productFromInteger:anInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   383
    "sent when an integer does not know how to multiply the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   384
a27a279701f8 Initial revision
claus
parents:
diff changeset
   385
    ^ (self class numerator:(anInteger * numerator)
a27a279701f8 Initial revision
claus
parents:
diff changeset
   386
                denominator:denominator) reduced
a27a279701f8 Initial revision
claus
parents:
diff changeset
   387
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   388
a27a279701f8 Initial revision
claus
parents:
diff changeset
   389
lessFromInteger:anInteger
a27a279701f8 Initial revision
claus
parents:
diff changeset
   390
    "sent when an integer does not know how to compare to the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   391
a27a279701f8 Initial revision
claus
parents:
diff changeset
   392
    ^ (denominator * anInteger) < numerator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   393
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   394
a27a279701f8 Initial revision
claus
parents:
diff changeset
   395
sumFromFloat:aFloat
a27a279701f8 Initial revision
claus
parents:
diff changeset
   396
    "sent when a float does not know how to add the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   397
a27a279701f8 Initial revision
claus
parents:
diff changeset
   398
    ^ (aFloat * denominator + numerator) / denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   399
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   400
a27a279701f8 Initial revision
claus
parents:
diff changeset
   401
differenceFromFloat:aFloat
a27a279701f8 Initial revision
claus
parents:
diff changeset
   402
    "sent when a float does not know how to subtract the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   403
a27a279701f8 Initial revision
claus
parents:
diff changeset
   404
    ^ (aFloat * denominator - numerator) / denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   405
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   406
a27a279701f8 Initial revision
claus
parents:
diff changeset
   407
productFromFloat:aFloat
a27a279701f8 Initial revision
claus
parents:
diff changeset
   408
    "sent when a float does not know how to multiply the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   409
a27a279701f8 Initial revision
claus
parents:
diff changeset
   410
    ^ aFloat * numerator / denominator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   411
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   412
a27a279701f8 Initial revision
claus
parents:
diff changeset
   413
quotientFromFloat:aFloat
a27a279701f8 Initial revision
claus
parents:
diff changeset
   414
    "sent when a float does not know how to divide by the recevier, a fraction"
a27a279701f8 Initial revision
claus
parents:
diff changeset
   415
a27a279701f8 Initial revision
claus
parents:
diff changeset
   416
    ^ (aFloat * denominator) / numerator
a27a279701f8 Initial revision
claus
parents:
diff changeset
   417
! !
a27a279701f8 Initial revision
claus
parents:
diff changeset
   418
a27a279701f8 Initial revision
claus
parents:
diff changeset
   419
!Fraction methodsFor:'printing'!
a27a279701f8 Initial revision
claus
parents:
diff changeset
   420
54
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   421
printOn:aStream
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   422
    "append a printed representation of the receiver to the
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   423
     argument, aStream"
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   424
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   425
    aStream nextPut:$(.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   426
    numerator printOn:aStream.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   427
    aStream nextPut:$/.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   428
    denominator printOn:aStream.
06dbdeeed4f9 *** empty log message ***
claus
parents: 44
diff changeset
   429
    aStream nextPut:$)
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   430
! !