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