Number.st
author Jan Vrany <jan.vrany@labware.com>
Sat, 29 Oct 2022 01:05:05 +0100
branchjv
changeset 25446 98fb817db6de
parent 25426 963f86568b2d
permissions -rw-r--r--
Add `Character >> isMathLetter` and `#isMathBinaryOperator`
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) 1988 by Claus Gittinger
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
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
"
5360
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
    12
"{ Package: 'stx:libbasic' }"
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
    13
17469
17e4b64a023b class: Number
Claus Gittinger <cg@exept.de>
parents: 17224
diff changeset
    14
"{ NameSpace: Smalltalk }"
17e4b64a023b class: Number
Claus Gittinger <cg@exept.de>
parents: 17224
diff changeset
    15
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    16
ArithmeticValue subclass:#Number
18850
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
    17
	instanceVariableNames:''
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
    18
	classVariableNames:'DecimalPointCharacterForPrinting DecimalPointCharactersForReading
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
    19
		DefaultDisplayRadix'
18850
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
    20
	poolDictionaries:''
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
    21
	category:'Magnitude-Numbers'
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    22
!
a27a279701f8 Initial revision
claus
parents:
diff changeset
    23
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1701
diff changeset
    24
!Number class methodsFor:'documentation'!
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    25
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    26
copyright
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    27
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    28
 COPYRIGHT (c) 1988 by Claus Gittinger
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    29
	      All Rights Reserved
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    30
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    31
 This software is furnished under a license and may be used
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    32
 only in accordance with the terms of that license and with the
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    33
 inclusion of the above copyright notice.   This software may not
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    34
 be provided or otherwise made available to, or used by, any
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    35
 other person.  No title to or ownership of the software is
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    36
 hereby transferred.
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    37
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    38
!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    39
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    40
documentation
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    41
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    42
    abstract superclass for all kinds of numbers
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1245
diff changeset
    43
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
    44
    [class variables:]
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    45
	DecimalPointCharacterForPrinting          <Character>                     used when printing
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    46
	DecimalPointCharactersForReading          <Collection of Character>       accepted as decimalPointChars when reading
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    47
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    48
	DefaultDisplayRadix     the radix in which integers present their
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    49
				displayString (which is used in inspectors)
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    50
				If you are to look at many hex numbers, bitmasks
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    51
				etc. you may set this to 2 or 16.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    52
				(avoids typing printStringRadix:.. all the time
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    53
				 - I know - I am lazy ;-). Default is 10.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    54
1295
83f594f05c52 documentation
Claus Gittinger <cg@exept.de>
parents: 1245
diff changeset
    55
    [author:]
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    56
	Claus Gittinger
1628
da30f2f41db7 comment
Claus Gittinger <cg@exept.de>
parents: 1557
diff changeset
    57
da30f2f41db7 comment
Claus Gittinger <cg@exept.de>
parents: 1557
diff changeset
    58
    [see also:]
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    59
	Integer LargeInteger SmallInteger
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    60
	LimitedPrecisionReal Float ShortFloat
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
    61
	Fraction FixedPoint
88
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    62
"
81dacba7a63a *** empty log message ***
claus
parents: 56
diff changeset
    63
! !
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    64
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1701
diff changeset
    65
!Number class methodsFor:'instance creation'!
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
    66
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    67
coerce:aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    68
    "convert the argument aNumber into an instance of the receiver (class) and return it."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    69
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    70
    self == Number ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    71
        self assert:(aNumber isNumber).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    72
        ^ aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    73
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    74
    ^ super coerce:aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    75
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    76
    "Created: / 21-06-2017 / 08:58:38 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    77
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
    78
11944
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    79
fastFromString:aString
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    80
    "return the next Float, Integer or ShortFloat from the string.
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    81
     No spaces are skipped.
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    82
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    83
     This is a specially tuned entry (using a low-level C-call), which
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    84
     returns garbage if the argument string is not a valid float number.
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    85
     It has been added to allow high speed string decomposition into numbers,
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    86
     especially for mass-data."
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    87
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    88
    ^ self fastFromString:aString at:1
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    89
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    90
    "
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    91
     Float fromString:'12345.0'
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    92
     Float fastFromString:'12345.0'
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    93
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    94
     Integer fromString:'12345'
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    95
     Integer fastFromString:'12345'
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    96
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    97
     should be roughly 10times faster than the general method:
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    98
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
    99
     Time millisecondsToRun:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   100
	100000 timesRepeat:[ Float fromString:'12345.0' ]
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   101
     ].
11944
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   102
     Time millisecondsToRun:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   103
	100000 timesRepeat:[ Float fastFromString:'12345.0' ]
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   104
     ].
11944
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   105
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   106
     Time millisecondsToRun:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   107
	100000 timesRepeat:[ Integer fromString:'12345' ]
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   108
     ].
11944
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   109
     Time millisecondsToRun:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   110
	100000 timesRepeat:[ Integer fastFromString:'12345' ]
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   111
     ].
11944
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   112
    "
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   113
!
6fb9813181cc *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 11770
diff changeset
   114
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   115
fastFromString:aString at:startIndex
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   116
    "return the next Float, Integer or ShortFloat from the string.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   117
     No spaces are skipped.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   118
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   119
     This is a specially tuned entry (using a low-level C-call), which
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   120
     returns garbage if the argument string is not a valid float number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   121
     It has been added to allow high speed string decomposition into numbers,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   122
     especially for mass-data."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   123
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   124
    self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   125
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   126
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   127
     Float fromString:'12345.0'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   128
     Float fastFromString:'12345.0'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   129
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   130
     Integer fromString:'12345'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   131
     Integer fastFromString:'12345'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   132
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   133
     should be roughly 10times faster than the general method:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   134
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   135
     Time millisecondsToRun:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   136
        100000 timesRepeat:[ Float fromString:'12345.0' ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   137
     ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   138
     Time millisecondsToRun:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   139
        100000 timesRepeat:[ Float fastFromString:'12345.0' ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   140
     ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   141
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   142
     Time millisecondsToRun:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   143
        100000 timesRepeat:[ Integer fromString:'12345' ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   144
     ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   145
     Time millisecondsToRun:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   146
        100000 timesRepeat:[ Integer fastFromString:'12345' ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   147
     ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   148
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   149
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   150
    "Created: / 21-07-2019 / 19:17:17 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   151
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   152
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   153
fromNumber:aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   154
    "return aNumber coerced to myself"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   155
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   156
    self isAbstract ifTrue:[^ aNumber]. 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   157
    ^ self coerce:aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   158
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   159
    "Created: / 21-06-2017 / 08:57:00 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   160
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   161
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   162
fromString:aString
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   163
    "return a number by reading from aString.
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   164
     In contrast to readFrom:, no garbage is allowed after the number.
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   165
     I.e. the string must contain exactly one valid number (with optional separators around)"
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   166
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   167
    ^ self
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   168
	fromString:aString
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   169
	decimalPointCharacters:(self decimalPointCharactersForReading)
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   170
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   171
    "
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   172
     Number fromString:'12345'
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   173
     Number fromString:'abc'
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   174
     Number fromString:'1abc'   -> raises an error
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   175
     Number readFrom:'1abc'     -> reads a 1
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   176
     Number readFrom:'10/2'     -> reads a 10
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   177
     Number fromString:'10/2'   -> raises an error
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   178
     Number fromString:'(1/2)'  -> reads a fraction
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   179
     Number readFrom:'(1/2)'    -> reads a fraction
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   180
     Number readFrom:'(10/2)'   -> reads a 5
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   181
     '12345' asNumber
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   182
    "
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   183
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   184
    "Modified: / 3.8.1998 / 20:05:11 / cg"
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   185
!
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   186
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   187
fromString:aString decimalPointCharacter:decimalPointCharacter
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   188
    "return a number by reading from aString.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   189
     In contrast to readFrom:, no garbage is allowed after the number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   190
     I.e. the string must contain exactly one valid number (with optional separators around)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   191
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   192
    ^ self fromString:aString decimalPointCharacters:(decimalPointCharacter asString)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   193
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   194
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   195
     Number fromString:'12345.99' decimalPointCharacter:$.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   196
     Number fromString:'12345,99' decimalPointCharacter:$,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   197
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   198
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   199
    "Created: / 21-07-2019 / 13:09:13 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   200
    "Modified (comment): / 21-07-2019 / 18:04:30 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   201
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   202
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   203
fromString:aString decimalPointCharacter:decimalPointCharacter onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   204
    "return a number by reading from aString.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   205
     In contrast to readFrom:, no garbage is allowed after the number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   206
     I.e. the string must contain exactly one valid number (with optional separators around)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   207
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   208
    ^ self 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   209
        fromString:aString 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   210
        decimalPointCharacters:(decimalPointCharacter asString) 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   211
        onError:exceptionBlock.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   212
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   213
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   214
     Number fromString:'12,345' decimalPointCharacter:',' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   215
     Number fromString:'12,345' decimalPointCharacter:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   216
     Number fromString:'12,345,456' decimalPointCharacter:$. thouseandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   217
     Number fromString:'12,345,45' decimalPointCharacter:$. thouseandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   218
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   219
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   220
    "Created: / 21-07-2019 / 13:07:39 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   221
    "Modified (comment): / 21-07-2019 / 18:50:18 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   222
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   223
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   224
fromString:aString decimalPointCharacter:decimalPointCharacter thousandsSeparator:thousandsSeparator onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   225
    "return a number by reading from aString.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   226
     In contrast to readFrom:, no garbage is allowed after the number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   227
     I.e. the string must contain exactly one valid number (with optional separators around)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   228
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   229
    ^ self 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   230
        fromString:aString 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   231
        decimalPointCharacters:(decimalPointCharacter asString) 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   232
        thousandsSeparator:thousandsSeparator
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   233
        onError:exceptionBlock.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   234
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   235
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   236
     Number fromString:'12,345' decimalPointCharacter:',' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   237
     Number fromString:'12,345' decimalPointCharacter:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   238
     Number fromString:'12345,456' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   239
     Number fromString:'12,345,456' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   240
     Number fromString:'12,345,456,789' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   241
     Number fromString:'12,345,456,789.89' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   242
     Number fromString:'12.345.456.789,89' decimalPointCharacter:$, thousandsSeparator:$. onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   243
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   244
    these report an error:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   245
     Number fromString:'12,345,45' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   246
     Number fromString:'12.345.456.789' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   247
     Number fromString:'12.345.456.78' decimalPointCharacter:$. thousandsSeparator:$, onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   248
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   249
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   250
    "Created: / 21-07-2019 / 18:50:57 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   251
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   252
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   253
fromString:aString decimalPointCharacters:decimalPointCharacters
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   254
    "return a number by reading from aString.
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   255
     In contrast to readFrom:, no garbage is allowed after the number.
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   256
     I.e. the string must contain exactly one valid number (with optional separators around)"
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   257
6899
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   258
    |s num|
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   259
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   260
    s := aString readStream.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   261
    num := self 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   262
            readFrom:s 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   263
            decimalPointCharacters:decimalPointCharacters 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   264
            onError:[^ ConversionError raiseRequestErrorString:' - invalid number'].
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   265
    s atEnd ifFalse:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   266
        s skipSeparators.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   267
        s atEnd ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   268
            ^ ConversionError raiseRequestErrorString:' - garbage at end of number'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   269
        ].
17056
dfbf6a7fd352 class: Number
Claus Gittinger <cg@exept.de>
parents: 16656
diff changeset
   270
    ].
6899
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   271
    ^ num.
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   272
3716
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   273
    "
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   274
     Number fromString:'12345'
6899
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   275
     Number fromString:'abc'
9ed8494c9f10 support for fixedPoint numbers (s-exponentCharacter)
Claus Gittinger <cg@exept.de>
parents: 6702
diff changeset
   276
     Number fromString:'1abc'
3716
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   277
     '12345' asNumber
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   278
    "
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   279
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   280
    "Modified: / 03-08-1998 / 20:05:11 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   281
    "Modified (format): / 21-07-2019 / 18:04:58 / Claus Gittinger"
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   282
!
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   283
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   284
fromString:aString decimalPointCharacters:decimalPointCharacters onError:exceptionBlock
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   285
    "return a number by reading from aString.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   286
     In contrast to readFrom:, no garbage is allowed after the number.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   287
     I.e. the string must contain exactly one valid number (with optional separators around)"
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   288
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   289
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   290
        fromString:aString 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   291
        decimalPointCharacters:decimalPointCharacters 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   292
        thousandsSeparator:nil 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   293
        onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   294
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   295
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   296
     Number fromString:'12345' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   297
     Number fromString:'12,345' decimalPointCharacters:',' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   298
     Number fromString:'12,345' decimalPointCharacters:',' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   299
     Number fromString:'fooBarBaz' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   300
     Number fromString:'123fooBarBaz' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   301
     Number fromString:'123,fooBarBaz' decimalPointCharacters:',' onError:0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   302
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   303
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   304
    "Modified: / 03-08-1998 / 20:05:34 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   305
    "Modified: / 21-07-2019 / 18:02:55 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   306
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   307
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   308
fromString:aString decimalPointCharacters:decimalPointCharacters thousandsSeparator:thousandsSeparator onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   309
    "return a number by reading from aString.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   310
     In contrast to readFrom:, no garbage is allowed after the number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   311
     I.e. the string must contain exactly one valid number (with optional separators around)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   312
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   313
    |s num|
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   314
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   315
    s := aString readStream.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   316
    num := self readFrom:s 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   317
            decimalPointCharacters:decimalPointCharacters 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   318
            thousandsSeparator:thousandsSeparator
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   319
            onError:[^ exceptionBlock value].
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   320
    s atEnd ifFalse:[
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   321
        s skipSeparators.
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   322
        s atEnd ifFalse:[
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   323
            ^ exceptionBlock value "/ - garbage at end of number'
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   324
        ].
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   325
    ].
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   326
    ^ num.
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   327
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   328
    "
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   329
     Number fromString:'12345' onError:0
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   330
     Number fromString:'12,345' decimalPointCharacters:',' onError:0
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   331
     Number fromString:'12,345' decimalPointCharacters:',' onError:0
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   332
     Number fromString:'fooBarBaz' onError:0
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   333
     Number fromString:'123fooBarBaz' onError:0
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   334
     Number fromString:'123,fooBarBaz' decimalPointCharacters:',' onError:0
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   335
    "
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   336
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   337
    "Created: / 21-07-2019 / 18:02:32 / Claus Gittinger"
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   338
!
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   339
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   340
fromString:aString onError:exceptionBlock
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   341
    "return a number by reading from aString.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   342
     In contrast to readFrom:, no garbage is allowed after the number.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   343
     I.e. the string must contain exactly one valid number (with optional separators around)"
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   344
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   345
    ^ self fromString:aString decimalPointCharacters:(self decimalPointCharactersForReading) onError:exceptionBlock
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   346
3716
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   347
    "
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   348
     Number fromString:'12345' onError:0
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   349
     Number fromString:'fooBarBaz' onError:0
21142
d9692dfa814f #BUGFIX by cg
Claus Gittinger <cg@exept.de>
parents: 21105
diff changeset
   350
     Number fromString:'123fooBarBaz' onError:0
3716
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   351
    "
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   352
e7904bd50d9d comment
Claus Gittinger <cg@exept.de>
parents: 3634
diff changeset
   353
    "Modified: / 3.8.1998 / 20:05:34 / cg"
3060
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   354
!
0faf242e1142 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 2894
diff changeset
   355
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   356
readFrom:aStringOrStream decimalPointCharacter:decimalPointCharacter
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   357
    "return the next Number from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   358
     skipping all whitespace first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   359
     Return the value of exceptionBlock, if no number can be read.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   360
     This method is less strict than the smalltalk number reader; it
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   361
     allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   362
     It also allows garbage after the number - i.e. it reads what it can.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   363
     See #fromString: , which is more strict and does not allow garbage at the end."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   364
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   365
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   366
        readFrom:aStringOrStream
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   367
        decimalPointCharacters:(decimalPointCharacter asString)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   368
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   369
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   370
     Number readFrom:'0' decimalPointCharacter:$.  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   371
     Number readFrom:'123.456' decimalPointCharacter:$.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   372
     Number readFrom:'123,456' decimalPointCharacter:$,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   373
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   374
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   375
    "Created: / 21-07-2019 / 13:09:52 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   376
    "Modified (comment): / 17-12-2019 / 14:42:47 / Stefan Reise"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   377
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   378
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   379
readFrom:aStringOrStream decimalPointCharacter:decimalPointCharacter onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   380
    "return the next Number from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   381
     skipping all whitespace first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   382
     Return the value of exceptionBlock, if no number can be read.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   383
     This method is less strict than the Smalltalk number reader; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   384
     it allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   385
     It supports the regular Smalltalk radix prefix xr.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   386
     It also allows garbage after the number - i.e. it reads what it can.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   387
     See #fromString: , which is more strict and does not allow garbage at the end.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   388
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   389
     Notice (see examples below): 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   390
        if sent to Number, it will decide which type of number to return (depending on the exponent character);
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   391
        if sent to a concrete number-class, an instance of that class will be returned (independent of the exponent character)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   392
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   393
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   394
    ^ self readFrom:aStringOrStream decimalPointCharacters:(decimalPointCharacter asString) onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   395
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   396
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   397
     Number readFrom:(ReadStream on:'54.32e-01') decimalPointCharacter:$. onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   398
     Number readFrom:(ReadStream on:'54,32e-01') decimalPointCharacter:$, onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   399
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   400
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   401
    "Created: / 21-07-2019 / 13:11:12 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   402
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   403
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   404
readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   405
    "return the next Number from the (character-)stream aStream;
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   406
     skipping all whitespace first.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   407
     Return the value of exceptionBlock, if no number can be read.
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   408
     This method is less strict than the smalltalk number reader; it
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   409
     allows for prefixed + and also allows missing fractional part after eE.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   410
     It also allows garbage after the number - i.e. it reads what it can.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   411
     See #fromString: , which is more strict and does not allow garbage at the end."
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   412
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   413
    ^ self
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   414
	readFrom:aStringOrStream
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   415
	decimalPointCharacters:decimalPointCharacters
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   416
	onError:[self error:'conversion error for: ' , self name]
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   417
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   418
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   419
     Number readFrom:'123.456' decimalPointCharacters:'.'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   420
     Number readFrom:'123,456' decimalPointCharacters:'.,'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   421
     Number readFrom:'123,456' decimalPointCharacters:'.'
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   422
    "
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   423
!
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   424
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   425
readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters allowCStyle:allowCStyle onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   426
    "return the next Number from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   427
     skipping all whitespace first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   428
     Return the value of exceptionBlock, if no number can be read.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   429
     This method is less strict than the Smalltalk number reader; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   430
     it allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   431
     It supports 0x, 0o and 0b prefixes (hex, octal and binary)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   432
     and the regular Smalltalk radix prefix xr.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   433
     If also allows for strings like '1.0×1015' to be read (as 1E+15).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   434
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   435
     It also allows garbage after the number - i.e. it reads what it can.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   436
     See #fromString: , which is more strict and does not allow garbage at the end.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   437
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   438
     Notice (see examples below): 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   439
        if sent to Number, it will decide which type of number to return (depending on the exponent character);
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   440
        if sent to a concrete number-class, an instance of that class will be returned (independent of the exponent character)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   441
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   442
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   443
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   444
        readFrom:aStringOrStream 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   445
        decimalPointCharacters:decimalPointCharacters
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   446
        thousandsSeparator:nil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   447
        allowCStyle:allowCStyle onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   448
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   449
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   450
     Number readFrom:(ReadStream on:'1.234.567,99') 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   451
        decimalPointCharacter:$,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   452
        thousandsSeparator:$.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   453
        onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   454
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   455
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   456
    "Created: / 27-10-2018 / 09:21:11 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   457
    "Modified: / 21-07-2019 / 13:06:54 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   458
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   459
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   460
readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters onError:exceptionBlock
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   461
    "return the next Number from the (character-)stream aStream;
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   462
     skipping all whitespace first.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   463
     Return the value of exceptionBlock, if no number can be read.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   464
     This method is less strict than the Smalltalk number reader; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   465
     it allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   466
     It supports the regular Smalltalk radix prefix xr.
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   467
     It also allows garbage after the number - i.e. it reads what it can.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   468
     See #fromString: , which is more strict and does not allow garbage at the end.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   469
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   470
     Notice (see examples below): 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   471
        if sent to Number, it will decide which type of number to return (depending on the exponent character);
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   472
        if sent to a concrete number-class, an instance of that class will be returned (independent of the exponent character)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   473
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   474
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   475
    ^ self 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   476
        readFrom:aStringOrStream 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   477
        decimalPointCharacters:decimalPointCharacters 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   478
        thousandsSeparator:nil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   479
        allowCStyle:true 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   480
        onError:exceptionBlock
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   481
329
claus
parents: 325
diff changeset
   482
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   483
     Number readFrom:(ReadStream on:'54.32e-01') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   484
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   485
     Number readFrom:(ReadStream on:'12345') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   486
     Number readFrom:(ReadStream on:'12345.0') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   487
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   488
     Number readFrom:(ReadStream on:'12345.0f') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   489
     Number readFrom:(ReadStream on:'12345.0e') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   490
     Number readFrom:(ReadStream on:'12345.0q') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   491
     Number readFrom:(ReadStream on:'12345.0d') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   492
     Number readFrom:(ReadStream on:'12345.0s') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   493
     Number readFrom:(ReadStream on:'12345.01s') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   494
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   495
     Float readFrom:(ReadStream on:'12345') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   496
     
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   497
     Number readFrom:(ReadStream on:'12345678901234567890')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   498
     Number readFrom:(ReadStream on:'12345678901234567890.0')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   499
     Number readFrom:(ReadStream on:'12345678901234567890.012345678901234567890')
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   500
     Number readFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF')   
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   501
     Number readFrom:'16rAAAAFFFFAAAAFFFF'
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   502
     Number readFrom:'16r100A'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   503
     Number readFrom:'16r100a'
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   504
     Number readFrom:'0.000001'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   505
     '+00000123.45' asNumber
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   506
     Number readFrom:'(1/3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   507
     Number readFrom:'(-1/3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   508
     Number readFrom:'(1/-3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   509
     Number readFrom:'-(1/3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   510
     Number readFrom:'-(-1/3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   511
     Number readFrom:'(-1/3'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   512
     Number readFrom:'99s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   513
     Number readFrom:'99.00s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   514
     Number readFrom:'99.0000000s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   515
     Number readFrom:'.0000000s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   516
     Number readFrom:'.0000000q'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   517
     Number readFrom:'.0000000f'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   518
     Number readFrom:'.0000000e'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   519
     Number readFrom:'.0000000s1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   520
     Number readFrom:'.0000000q1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   521
     Number readFrom:'.0000000f1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   522
     Number readFrom:'.0000000e1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   523
     LongFloat readFrom:'.00000001'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   524
     Number readFrom:'.00000000000001'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   525
     Number readFrom:'.001'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   526
     ShortFloat readFrom:'.001'
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   527
     Number readFrom:'123garbage'      -> returns 123
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   528
     Number fromString:'123garbage'    -> raises an error
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   529
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   530
     DecimalPointCharactersForReading := #( $. $, ).
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   531
     Number readFrom:'99,00'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   532
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   533
     DecimalPointCharactersForReading := #( $. ).
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   534
     Number readFrom:'99,00'
329
claus
parents: 325
diff changeset
   535
    "
569
7134eb78cf48 readFrom:onError: can now also read from a string
Claus Gittinger <cg@exept.de>
parents: 530
diff changeset
   536
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   537
    "Modified: / 17-07-2017 / 15:18:03 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   538
    "Modified: / 21-07-2019 / 13:05:19 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   539
    "Modified: / 17-12-2019 / 14:19:54 / Stefan Reise"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   540
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   541
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   542
readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters thousandsSeparator:thousandsSeparator allowCStyle:allowCStyle onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   543
    "return the next Number from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   544
     skipping all whitespace first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   545
     Return the value of exceptionBlock, if no number can be read.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   546
     This method is less strict than the Smalltalk number reader; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   547
     it allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   548
     It supports 0x, 0o and 0b prefixes (hex, octal and binary)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   549
     and the regular Smalltalk radix prefix xr.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   550
     If also allows for strings like '1.0×1015' to be read (as 1E+15).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   551
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   552
     It also allows garbage after the number - i.e. it reads what it can.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   553
     See #fromString: , which is more strict and does not allow garbage at the end.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   554
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   555
     Notice (see examples below): 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   556
        if sent to Number, it will decide which type of number to return (depending on the exponent character);
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   557
        if sent to a concrete number-class, an instance of that class will be returned (independent of the exponent character)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   558
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   559
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   560
    ^ [
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   561
        |value intValue mantissaAndScale scale str
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   562
         nextChar radix sign signExp exp numerator denom expChar expChar2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   563
         fragment mantissa|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   564
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   565
        str := aStringOrStream readStream.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   566
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   567
        nextChar := str skipSeparators.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   568
        nextChar isNil ifTrue:[^ exceptionBlock value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   569
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   570
        (nextChar == $-) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   571
            sign := -1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   572
            nextChar := str nextPeekOrNil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   573
        ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   574
            sign := 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   575
            (nextChar == $+) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   576
                nextChar := str nextPeekOrNil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   577
            ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   578
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   579
        nextChar == $( ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   580
            "maybe a Fraction e.g. (1/3)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   581
            str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   582
            numerator := Integer readFrom:str onError:[^ exceptionBlock value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   583
            str skipSeparators.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   584
            nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   585
            nextChar == $/ ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   586
                str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   587
                denom := Integer readFrom:str onError:[^ exceptionBlock value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   588
                str skipSeparators.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   589
                nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   590
            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   591
            nextChar == $) ifFalse:[^ exceptionBlock value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   592
            str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   593
            value := Fraction numerator:numerator denominator:denom.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   594
            sign < 0 ifTrue:[ value := value negated ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   595
            (self ~~ Number and:[self ~~ Fraction]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   596
                value := self coerce:value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   597
            ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   598
            ^ value
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   599
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   600
        nextChar isNil ifTrue:[^ exceptionBlock value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   601
        (nextChar isDigit or:[(decimalPointCharacters includes:nextChar)]) ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   602
            ^ exceptionBlock value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   603
"/          value := super readFrom:str.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   604
"/          sign == -1 ifTrue:[value := value negated].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   605
"/          ^ value
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   606
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   607
        radix := 10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   608
        (decimalPointCharacters includes:nextChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   609
            self isAbstract ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   610
                value := 0.0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   611
            ] ifFalse:[    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   612
                value := self zero. "/ 0.0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   613
            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   614
            intValue := 0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   615
        ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   616
            (allowCStyle and:[nextChar == $0]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   617
                nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   618
                nextChar isNil ifTrue:[^ 0].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   619
                ((nextChar == $x) or:[nextChar == $X]) ifTrue:[ radix := 16 ] 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   620
                ifFalse:[ ((nextChar == $b) or:[nextChar == $B]) ifTrue:[ radix := 2 ] 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   621
                ifFalse:[ ((nextChar == $o) or:[nextChar == $O]) ifTrue:[ radix := 8 ]]].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   622
            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   623
            radix ~~ 10 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   624
                nextChar := str nextPeekOrNil.  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   625
                (nextChar notNil and:[nextChar isDigitRadix:radix]) ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   626
                    ^ exceptionBlock value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   627
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   628
                value := Integer readFrom:str radix:radix.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   629
                nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   630
            ] ifFalse:[        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   631
                value := Integer readFrom:str radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   632
                nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   633
                [ thousandsSeparator notNil and:[nextChar == thousandsSeparator] ] whileTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   634
                    str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   635
                    fragment := str next:3.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   636
                    (fragment conform:#isDigit) ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   637
                        ^ exceptionBlock value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   638
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   639
                    value := (value * 1000) + (Integer fastFromString:fragment at:1).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   640
                    nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   641
                ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   642
                ((nextChar == $r) or:[ nextChar == $R]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   643
                    str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   644
                    str peek == $- ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   645
                        sign := -1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   646
                        str next
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   647
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   648
                    radix := value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   649
                    value := Integer readFrom:str radix:radix.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   650
                    nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   651
                ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   652
                    radix := 10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   653
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   654
            ].        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   655
            intValue := value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   656
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   657
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   658
        (self == Integer or:[self inheritsFrom:Integer]) ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   659
            (decimalPointCharacters includes:nextChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   660
                nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   661
                (nextChar notNil and:[nextChar isDigitRadix:radix]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   662
                    mantissaAndScale := self readMantissaAndScaleFrom:str radix:radix.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   663
                    mantissa := mantissaAndScale first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   664
                    value := (mantissa coerce:value) + mantissa.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   665
                    nextChar := str peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   666
                ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   667
            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   668
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   669
            ('eEdDqQfF' includes:nextChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   670
                expChar := nextChar.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   671
                nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   672
                expChar == $Q ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   673
                    nextChar == $D ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   674
                        expChar2 := nextChar.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   675
                        nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   676
                    ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   677
                        nextChar == $L ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   678
                            expChar2 := nextChar.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   679
                            nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   680
                        ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   681
                    ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   682
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   683
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   684
                signExp := 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   685
                (nextChar == $+) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   686
                    nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   687
                ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   688
                    (nextChar == $-) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   689
                        nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   690
                        signExp := -1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   691
                    ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   692
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   693
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   694
                "/ if I am abstract (i.e. I am Number or LPReal),
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   695
                "/ let the exponent-character decide what kind of float we get:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   696
                "/      qQ   -> LongFloat
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   697
                "/      eEdD -> Float      (which is ieee-double)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   698
                "/      fF   -> ShortFloat (which is ieee-float)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   699
                
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   700
                self isAbstract ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   701
                    ('qQ' includes:expChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   702
                        expChar2 == $D ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   703
                            value := value asQDouble
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   704
                        ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   705
                            expChar2 == $L ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   706
                                value := value asLargeFloat
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   707
                            ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   708
                                value := value asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   709
                            ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   710
                        ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   711
                    ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   712
                        ('fF' includes:expChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   713
                            value := value asShortFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   714
                        ] ifFalse:[    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   715
                            "/ maybe in the far future we might create shortfloats when seeing eE,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   716
                            "/ and only produce doubles on dD.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   717
                            "/ (for now, always create Doubles for Dolphin, Squeak etc. compatibility)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   718
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   719
                            false "('eE' includes:expChar)" ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   720
                                value := value asShortFloat
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   721
                            ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   722
                                value := value asFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   723
                            ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   724
                        ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   725
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   726
                ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   727
                    value := self coerce:value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   728
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   729
                
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   730
                (nextChar notNil and:[(nextChar isDigitRadix:radix)]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   731
                    exp := (Integer readFrom:str radix:radix) * signExp.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   732
                    value := value * ((value class unity * 10.0) raisedToInteger:exp)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   733
                ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   734
            ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   735
                ('sS' includes:nextChar) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   736
                    nextChar := str nextPeekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   737
                    (nextChar notNil and:[ nextChar isDigit]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   738
                        scale := (Integer readFrom:str).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   739
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   740
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   741
                    mantissaAndScale isNil ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   742
                        value := intValue asFixedPoint:(scale ? 0).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   743
                    ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   744
                        denom := 10 raisedTo:mantissaAndScale last.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   745
                        value := FixedPoint
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   746
                                    numerator:(intValue * denom) + (mantissaAndScale second)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   747
                                    denominator:denom
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   748
                                    scale:(scale ? mantissaAndScale third).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   749
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   750
                ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   751
                    (nextChar == $×) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   752
                        (((nextChar := str nextPeek) == $1)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   753
                          and:[ ((nextChar := str nextPeek) == $0) ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   754
                        ) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   755
                            str next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   756
                            exp := (Integer readFrom:str).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   757
                            value := value * ((value class unity * 10.0) raisedToInteger:exp).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   758
                        ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   759
                            ^ exceptionBlock value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   760
                        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   761
                    ] ifFalse:[        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   762
                        (self inheritsFrom:LimitedPrecisionReal) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   763
                            "when requesting a specific Float instance, coerce it.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   764
                             otherwise return a value without loosing precision"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   765
                            (self isAbstract not and:[value class == self]) ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   766
                                value := self coerce:value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   767
                            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   768
                        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   769
                    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   770
                ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   771
            ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   772
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   773
        sign == -1 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   774
            value := value negated
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   775
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   776
        value.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   777
    ] on:Error do:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   778
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   779
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   780
     Number readFrom:(ReadStream on:'54.32e-01') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   781
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   782
     Number readFrom:(ReadStream on:'12345') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   783
     Number readFrom:(ReadStream on:'12345.0') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   784
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   785
     Number readFrom:(ReadStream on:'12345.0f') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   786
     Number readFrom:(ReadStream on:'12345.0e') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   787
     Number readFrom:(ReadStream on:'12345.0q') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   788
     Number readFrom:(ReadStream on:'12345.0d') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   789
     Number readFrom:(ReadStream on:'12345.0s') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   790
     Number readFrom:(ReadStream on:'12345.01s') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   791
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   792
     Float readFrom:(ReadStream on:'12345') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   793
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   794
     Number readFrom:(ReadStream on:'12345678901234567890')
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   795
     Number readFrom:(ReadStream on:'12345678901234567890.0')
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   796
     Number readFrom:(ReadStream on:'12345678901234567890.012345678901234567890')
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   797
     Number readFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF')
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   798
     Number readFrom:'16rAAAAFFFFAAAAFFFF'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   799
     Number readFrom:'16r100A'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   800
     Number readFrom:'16r100a'  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   801
     Number readFrom:'16r-100A'      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   802
     Number readFrom:'-16r100A'      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   803
     Number readFrom:'0x100A'      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   804
     Number readFrom:'-0x100A'      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   805
     Number readFrom:'0x-100A'      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   806
     Number readFrom:'0.000001'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   807
     '+00000123.45' asNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   808
     Number readFrom:'(1/3)'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   809
     Number readFrom:'(-1/3)'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   810
     Number readFrom:'(1/-3)'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   811
     Number readFrom:'-(1/3)'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   812
     Number readFrom:'-(-1/3)'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   813
     Number readFrom:'(-1/3'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   814
     Number readFrom:'99s'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   815
     Number readFrom:'99.00s'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   816
     Number readFrom:'99.0000000s'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   817
     Number readFrom:'.0000000s'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   818
     Number readFrom:'.0000000q'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   819
     Number readFrom:'.0000000f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   820
     Number readFrom:'.0000000e'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   821
     Number readFrom:'.0000000s1'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   822
     Number readFrom:'.0000000q1'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   823
     Number readFrom:'.0000000f1'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   824
     Number readFrom:'.0000000e1'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   825
     LongFloat readFrom:'.00000001'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   826
     Number readFrom:'.00000000000001'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   827
     Number readFrom:'.001'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   828
     ShortFloat readFrom:'.001'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   829
     Number readFrom:'123garbage'      -> returns 123
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   830
     Number fromString:'123garbage'    -> raises an error
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   831
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   832
     DecimalPointCharactersForReading := #( $. $, ).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   833
     Number readFrom:'99,00'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   834
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   835
     DecimalPointCharactersForReading := #( $. ).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   836
     Number readFrom:'99,00'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   837
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   838
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   839
    "Created: / 21-07-2019 / 13:05:04 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   840
    "Modified: / 21-07-2019 / 19:40:34 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   841
    "Modified (comment): / 17-12-2019 / 14:28:03 / Stefan Reise"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   842
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   843
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   844
readFrom:aStringOrStream decimalPointCharacters:decimalPointCharacters thousandsSeparator:thousandsSeparator onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   845
    "return the next Number from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   846
     skipping all whitespace first.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   847
     Return the value of exceptionBlock, if no number can be read.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   848
     This method is less strict than the Smalltalk number reader; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   849
     it allows for prefixed + and also allows missing fractional part after eE.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   850
     It supports the regular Smalltalk radix prefix xr.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   851
     It also allows garbage after the number - i.e. it reads what it can.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   852
     See #fromString: , which is more strict and does not allow garbage at the end.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   853
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   854
     Notice (see examples below): 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   855
        if sent to Number, it will decide which type of number to return (depending on the exponent character);
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   856
        if sent to a concrete number-class, an instance of that class will be returned (independent of the exponent character)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   857
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   858
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   859
    ^ self 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   860
        readFrom:aStringOrStream 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   861
        decimalPointCharacters:decimalPointCharacters 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   862
        thousandsSeparator:thousandsSeparator
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   863
        allowCStyle:false 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   864
        onError:exceptionBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   865
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   866
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   867
     Number readFrom:(ReadStream on:'12345') decimalPointCharacters:'.' onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   868
     Number readFrom:(ReadStream on:'12,345.0') decimalPointCharacters:'.' thousandsSeparator:$, onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   869
     Number readFrom:(ReadStream on:'12,1345.0') decimalPointCharacters:'.' thousandsSeparator:$, onError:[self halt].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   870
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   871
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   872
    "Created: / 21-07-2019 / 17:59:57 / Claus Gittinger"
296
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   873
!
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   874
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   875
readFrom:aStringOrStream onError:exceptionBlock
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   876
    "return the next Number from the (character-)stream aStream;
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   877
     skipping all whitespace first; return the value of exceptionBlock,
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   878
     if no number can be read.
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   879
     This method is less strict than the smalltalk number reader; it
17057
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   880
     allows for prefixed + and also allows missing fractional part after eE.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   881
     It also allows garbage after the number - i.e. it reads what it can.
08f275c70437 class: Number
Claus Gittinger <cg@exept.de>
parents: 17056
diff changeset
   882
     See #fromString: , which is more strict and does not allow garbage at the end."
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   883
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   884
    ^ self
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   885
        readFrom:aStringOrStream
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   886
        decimalPointCharacters:(self decimalPointCharactersForReading)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   887
        onError:exceptionBlock
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   888
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   889
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   890
     Number readFrom:(ReadStream on:'54.32e-01')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   891
     Number readFrom:(ReadStream on:'12345678901234567890')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   892
     Number readFrom:(ReadStream on:'12345678901234567890.0')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   893
     Number readFrom:(ReadStream on:'12345678901234567890.012345678901234567890')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   894
     Number readFrom:(ReadStream on:'16rAAAAFFFFAAAAFFFF')
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   895
     Number readFrom:'16rAAAAFFFFAAAAFFFF'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   896
     Number readFrom:'0.000001'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   897
     '+00000123.45' asNumber
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   898
     Number readFrom:'0'
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   899
     Number readFrom:'99s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   900
     Number readFrom:'99.00s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   901
     Number readFrom:'99.0000000s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   902
     Number readFrom:'.0000000s'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   903
     Number readFrom:'.0000000q'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   904
     Number readFrom:'.0000000f'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   905
     Number readFrom:'.0000000e'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   906
     Number readFrom:'.0000000s1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   907
     Number readFrom:'.0000000q1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   908
     Number readFrom:'.0000000f1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   909
     Number readFrom:'.0000000e1'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   910
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   911
     DecimalPointCharactersForReading := #( $. $, ).
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   912
     Number readFrom:'99,00'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   913
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   914
     DecimalPointCharactersForReading := #( $. ).
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   915
     Number readFrom:'99,00'
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   916
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   917
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   918
    "Modified (comment): / 17-12-2019 / 14:42:57 / Stefan Reise"
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   919
!
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
   920
296
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   921
readSmalltalkSyntaxFrom:aStream
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   922
    "ST-80 compatibility (thanks to a note from alpha testers).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   923
     Read and return the next Number in Smalltalk syntax from the
7356
fe8fb0a571f2 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
   924
     (character-) aStream.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   925
     Returns nil if aStream contains no valid number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   926
     Notice that ST/X supports C-style integers, which VW does not"
329
claus
parents: 325
diff changeset
   927
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   928
    ^ self readSmalltalkSyntaxFrom:aStream onError:nil.
296
754358c5508a *** empty log message ***
claus
parents: 293
diff changeset
   929
329
claus
parents: 325
diff changeset
   930
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   931
     Number readSmalltalkSyntaxFrom:'99d'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   932
     Number readSmalltalkSyntaxFrom:'99.00d'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   933
     Number readSmalltalkSyntaxFrom:'54.32e-01'
15078
997a122ceeb5 class: Number
Stefan Vogel <sv@exept.de>
parents: 14495
diff changeset
   934
     Number readSmalltalkSyntaxFrom:'12345678901234567890'
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   935
     Number readSmalltalkSyntaxFrom:'16rAAAAFFFFAAAAFFFF'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   936
     Number readSmalltalkSyntaxFrom:'foobar'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   937
     Number readSmalltalkSyntaxFrom:'(1/10)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   938
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   939
     Number readSmalltalkSyntaxFrom:'(1/0)'
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   940
     Number readSmalltalkSyntaxFrom:'0xA0'  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   941
     Number readSmalltalkSyntaxFrom:'0b1010'  
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   942
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   943
     Number readFrom:'(1/3)'
15078
997a122ceeb5 class: Number
Stefan Vogel <sv@exept.de>
parents: 14495
diff changeset
   944
     Number readFrom:'(-1/3)'
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   945
     Number readFrom:'-(1/3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   946
     Number readFrom:'(1/-3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   947
     Number readFrom:'(-1/-3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   948
     Number readFrom:'-(-1/-3)'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   949
     Number readSmalltalkSyntaxFrom:'+00000123.45'
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   950
     Number readFrom:'+00000123.45'
5013
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   951
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   952
     |s|
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   953
     s := ReadStream on:'2.'.
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   954
     Number readSmalltalkSyntaxFrom:s.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   955
     s next
5013
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   956
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   957
     |s|
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   958
     s := ReadStream on:'2.0.'.
e2aff65e6eba comment
Claus Gittinger <cg@exept.de>
parents: 4988
diff changeset
   959
     Number readSmalltalkSyntaxFrom:s.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   960
     s next
329
claus
parents: 325
diff changeset
   961
    "
3613
75629df7f224 fixed readSmalltalkSyntax (dont read behind number)
Claus Gittinger <cg@exept.de>
parents: 3394
diff changeset
   962
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   963
    "Modified: / 19-11-1999 / 18:26:47 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   964
    "Modified (comment): / 30-05-2020 / 11:22:26 / cg"
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   965
!
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   966
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   967
readSmalltalkSyntaxFrom:aStream onError:errorValue
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   968
    "ST-80 compatibility (thanks to a note from alpha testers)
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   969
     read and return the next Number in smalltalk syntax from the
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   970
     (character-) aStream.
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   971
     Returns nil if aStream contains no valid number."
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   972
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   973
    |n|
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   974
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   975
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   976
        n := Scanner scanNumberFrom:aStream.
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   977
    ] on:Error do:[:ex|
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   978
        n := nil
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   979
    ].
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   980
    n isNil ifTrue:[^ errorValue value].
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   981
    ^ n
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   982
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   983
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
   984
     Number readSmalltalkSyntaxFrom:'foo' onError:123
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   985
     Number readSmalltalkSyntaxFrom:'16r123' onError:-1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   986
     Number readSmalltalkSyntaxFrom:'0x123' onError:-1   
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   987
     Number readSmalltalkSyntaxFrom:'16r1.1' onError:-1  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   988
     Number readSmalltalkSyntaxFrom:'10r1.1' onError:-1    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   989
     Number readSmalltalkSyntaxFrom:'16r10.1' onError:-1  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   990
     Number readSmalltalkSyntaxFrom:'10r10.1' onError:-1    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   991
     Number readSmalltalkSyntaxFrom:'16r10.1e10' onError:-1  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   992
     Number readSmalltalkSyntaxFrom:'10r10.1e10' onError:-1    
15776
e7f5200ad493 class: Number
Claus Gittinger <cg@exept.de>
parents: 15595
diff changeset
   993
    "
1
a27a279701f8 Initial revision
claus
parents:
diff changeset
   994
! !
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
   995
17686
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
   996
!Number class methodsFor:'Compatibility-VW'!
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
   997
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
   998
readIntegerFrom:aStream radix:radix
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
   999
    "for VisualWorks compatibility"
17686
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
  1000
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
  1001
    ^ Integer readFrom:aStream radix:radix
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1002
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1003
    "Modified (comment): / 08-06-2017 / 13:58:36 / mawalch"
17686
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
  1004
! !
f3233f56df6f class: Number
Claus Gittinger <cg@exept.de>
parents: 17469
diff changeset
  1005
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  1006
!Number class methodsFor:'constants'!
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  1007
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1008
e
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1009
    "return the closest approximation of the irrational number e"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1010
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1011
    ^ self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1012
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1013
    "Modified: / 16-06-2017 / 11:04:49 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1014
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1015
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1016
eDigits
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1017
    "return th printString of the irrational number e,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1018
     with enough digits so that instances with different precision can read from it"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1019
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1020
    "/ number asked from wolfram 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1021
    ^ '2.71828182845904523536028747135266249775724709369995957496696762772407663035354759457138217852516642742746'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1022
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1023
    "Created: / 06-06-2019 / 16:58:50 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1024
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1025
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1026
i
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1027
    "return the imaginary unit i"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1028
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1029
    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1030
    ^ Complex real:0 imaginary:1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1031
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1032
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1033
     1 + Number i          -> (1+1i)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1034
     Number i + 10         -> (10+1i)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1035
     Number i * Number i   -> -1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1036
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1037
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1038
    "Created: / 01-07-2017 / 19:44:53 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1039
    "Modified (comment): / 22-09-2017 / 09:53:14 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1040
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1041
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1042
ln10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1043
    "return ln(10) in my representation (and accuracy)."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1044
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1045
    ^ self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1046
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1047
    "Created: / 16-06-2017 / 11:00:38 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1048
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1049
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1050
ln2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1051
    "return ln(2) in my representation (and accuracy)."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1052
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1053
    ^ self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1054
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1055
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1056
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1057
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1058
phi
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1059
    "return Phi in my representation (and accuracy)."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1060
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1061
    ^ self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1062
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1063
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1064
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1065
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1066
phiDigits
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1067
    "return th printString of the irrational number pi,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1068
     with enough digits so that instances with different precision can read from it"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1069
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1070
    ^ '1.618033988749894848204586834365638117720309179805762862135'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1071
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1072
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1073
pi
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1074
    "return Pi in my representation (and accuracy)."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1075
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1076
    ^ self subclassResponsibility
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1077
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1078
    "Modified (format): / 16-06-2017 / 11:00:42 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1079
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1080
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1081
piDigits
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1082
    "return th printString of the irrational number pi,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1083
     with enough digits so that instances with different precision can read from it"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1084
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1085
    "/ number asked from wolfram 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1086
    "/ ^ '3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170679821480865132823066470938446095505822317253594081284811174502841027019385211055596446229489549303819644288109756659334461284756482337867831652712019091456485669234603486104543266482133936072602491412737245870066063155881748815209209628292540917153643678925903600113305305488204665213841469519415116094330572703657595919530921861173819326117931051185480744623799627495673518857527248912279381830119491298336733624406566430860213949463952247371907021798609437027705392171762931767523846748184676694051320005681271452635608277857713427577896091736371787214684409012249534301465495853710507922796892589235420199561121290219608640344181598136297747713099605187072113499999983729780499510597317328160963185950244594553469083026425223082533446850352619311881710100031378387528865875332083814206171776691473035982534904'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1087
    "/ rounded to 100 digits
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1088
    ^ '3.141592653589793238462643383279502884197169399375105820974944592307816406286208998628034825342117068'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1089
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1090
    "Created: / 06-06-2019 / 17:08:17 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1091
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1092
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1093
!Number class methodsFor:'constants & defaults'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1094
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1095
decimalPointCharacter
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1096
    "printed"
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1097
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1098
    <resource: #obsolete>
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1099
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1100
    ^ self decimalPointCharacterForPrinting
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1101
!
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1102
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1103
decimalPointCharacter:aCharacter
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1104
    "printed"
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1105
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1106
    <resource: #obsolete>
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1107
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1108
    self decimalPointCharacterForPrinting:aCharacter
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1109
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1110
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1111
     1.5 printString
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1112
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1113
     Number decimalPointCharacter:$,.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1114
     1.5 printString
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1115
     Number decimalPointCharacter:$..
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1116
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1117
!
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1118
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1119
decimalPointCharacterForPrinting
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1120
    "printed"
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1121
16267
beef1cb9c801 class: Number
Claus Gittinger <cg@exept.de>
parents: 16070
diff changeset
  1122
    ^ DecimalPointCharacterForPrinting ? $.
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1123
!
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1124
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1125
decimalPointCharacterForPrinting:aCharacter
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1126
    "printed"
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1128
    DecimalPointCharacterForPrinting := aCharacter
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1129
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1130
    "
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1131
     1.5 printString
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1132
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1133
     Number decimalPointCharacterForPrinting:$,.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1134
     1.5 printString
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1135
     Number decimalPointCharacterForPrinting:$..
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1136
    "
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1137
!
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1138
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1139
decimalPointCharacters
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1140
    "accepted when converting from a string"
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1141
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1142
    <resource: #obsolete>
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1143
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1144
    ^ self decimalPointCharactersForReading
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1145
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1146
    "
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1147
     1.5 printString
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1148
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1149
     Number decimalPointCharacters:#( $. $,) .
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1150
     Number fromString:'1.5'.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1151
     Number fromString:'1,5'.
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1152
     Number decimalPointCharacters:#( $. ).
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1153
    "
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1154
!
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1155
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1156
decimalPointCharacters:aCollectionOfCharacters
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1157
    "accepted when converting from a string"
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1158
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1159
    <resource: #obsolete>
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1160
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1161
    self decimalPointCharactersForReading:aCollectionOfCharacters
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1162
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1163
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1164
     Number decimalPointCharacters:#( $. $,) .
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1165
     Number fromString:'1.5'.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1166
     Number fromString:'1,5'.
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1167
     Number decimalPointCharacters:#( $. ).
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1168
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1169
!
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1170
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1171
decimalPointCharactersForReading
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
  1172
    "default when converting from a string"
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1173
9333
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
  1174
    "/ cg: changing the default leads to trouble in some
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
  1175
    "/ language processors (PrologScanner...)
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
  1176
    "/ PLEASE DO ONLY CHANGE THE DEFAULT BELOW FOR END-USER APPLICATIONS (if at all).
c1d712705426 decimalPointCharacter stuff
Claus Gittinger <cg@exept.de>
parents: 9274
diff changeset
  1177
    "/ BETTER: pass the DecimalPointCharacterSet explicitly
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1178
    DecimalPointCharactersForReading isNil ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1179
	^ #( $. )
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1180
    ].
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1181
    ^ DecimalPointCharactersForReading
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1182
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1183
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1184
     1.5 printString
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1185
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1186
     Number decimalPointCharactersForReading:#( $. $,) .
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1187
     Number fromString:'1.5'.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1188
     Number fromString:'1,5'.
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1189
     Number decimalPointCharactersForReading:#( $. ).
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1190
    "
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1191
!
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1192
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1193
decimalPointCharactersForReading:aCollectionOfCharacters
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1194
    "accepted when converting from a string"
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1195
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1196
    DecimalPointCharactersForReading := aCollectionOfCharacters
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1197
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1198
    "
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1199
     Number decimalPointCharactersForReading:#( $. $,) .
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1200
     Number fromString:'1.5'.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1201
     Number fromString:'1,5'.
9274
f3b231fb2ef7 comments
Claus Gittinger <cg@exept.de>
parents: 9140
diff changeset
  1202
     Number decimalPointCharactersForReading:#( $. ).
8303
837daadaab78 decimalPointCharacter definition
werner
parents: 8301
diff changeset
  1203
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1204
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1205
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1206
!Number class methodsFor:'error reporting'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1207
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1208
raise:aSignalSymbolOrErrorClass receiver:someNumber selector:sel arg:arg errorString:text
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1209
    "ST-80 compatible signal raising. Provided for public domain numeric classes"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1210
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1211
    <context: #return>
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1212
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1213
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1214
        raise:aSignalSymbolOrErrorClass
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1215
        receiver:someNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1216
        selector:sel
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1217
        arguments:(Array with:arg)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1218
        errorString:text
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1219
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1220
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1221
     Number
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1222
        raise:#domainErrorSignal
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1223
        receiver:1.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1224
        selector:#sin
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1225
        arg:nil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1226
        errorString:'foo bar test'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1227
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1228
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1229
    "Modified: / 16-11-2001 / 14:12:50 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1230
    "Modified (comment): / 30-05-2020 / 10:08:50 / cg"
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1231
!
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  1232
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1233
raise:aSignalSymbolOrErrorClass receiver:someNumber selector:sel errorString:text
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1234
    "ST-80 compatible signal raising. Provided for public domain numeric classes.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1235
     aSignalSymbolOrErrorClass is either an Error-subclass, or
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1236
     the selector which is sent to myself, to retrieve the Exception class / Signal."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1237
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1238
    <context: #return>
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1239
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1240
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1241
        raise:aSignalSymbolOrErrorClass
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1242
        receiver:someNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1243
        selector:sel
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1244
        arguments:#()
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1245
        errorString:text
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1246
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1247
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1248
     Number
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1249
        raise:#domainErrorSignal
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1250
        receiver:1.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1251
        selector:#foo
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1252
        errorString:'foo bar test'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1253
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1254
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1255
    "Modified: / 16-11-2001 / 14:13:16 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1256
    "Modified (comment): / 30-05-2020 / 10:08:59 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1257
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1258
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1259
!Number class methodsFor:'misc'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1260
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1261
displayRadix:aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1262
    "being tired of always sending #printStringRadix: in the inspectors,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1263
     this allows you to change the default print radix for the displayString
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1264
     method."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1265
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1266
    DefaultDisplayRadix := aNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1267
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1268
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1269
     Integer displayRadix:16. 123456 inspect
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1270
     Integer displayRadix:10. 123456 inspect
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1271
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1272
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1273
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1274
!Number class methodsFor:'private'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1275
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1276
readMantissaAndScaleFrom:aStream radix:radix
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1277
    "helper for readFrom: -
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1278
     return the mantissa (post-decimal-point digits) from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1279
     in addition, the mantissa as integer and the scale (number of postDecimalPoint digits) is returned
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1280
     (both to support reading fixedPoint numbers and to not loose precision).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1281
     The integer mantissa is needed as we do not yet know the target type (could be LongFloat or even QDouble).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1282
     No whitespace is skipped."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1283
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1284
    |nextChar intMantissa scale digit scaleFactor value|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1285
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1286
    scale := 0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1287
    scaleFactor := 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1288
    intMantissa := 0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1289
    nextChar := aStream peekOrNil.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1290
    [nextChar notNil and:[nextChar isDigitRadix:radix]] whileTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1291
        digit := nextChar digitValue.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1292
        scaleFactor := scaleFactor * radix.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1293
        intMantissa := (intMantissa * radix) + digit.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1294
        scale := scale + 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1295
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1296
        aStream next.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1297
        nextChar := aStream peekOrNil
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1298
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1299
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1300
    self isAbstract ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1301
        value := (self coerce:intMantissa) / (self coerce:scaleFactor).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1302
    ] ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1303
        "/ Float decimalPrecision
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1304
        "/ LongFloat decimalPrecision
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1305
        scale > 6 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1306
            "/ scale > 19 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1307
            "/     value := intMantissa asLargeFloat / scaleFactor asLargeFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1308
            "/ ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1309
                value := intMantissa asLongFloat / scaleFactor asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1310
            "/ ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1311
        ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1312
            value := intMantissa asFloat / scaleFactor asFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1313
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1314
    ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1315
    ^ (Array with:value with:intMantissa with:scale).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1316
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1317
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1318
     Number readMantissaAndScaleFrom:'234'    readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1319
     Number readMantissaAndScaleFrom:'2'      readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1320
     Number readMantissaAndScaleFrom:'234567' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1321
     Number readMantissaAndScaleFrom:'234000' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1322
     Number readMantissaAndScaleFrom:'234'    readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1323
     Number readMantissaAndScaleFrom:'000234' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1324
     Number readMantissaAndScaleFrom:'01' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1325
     Number readMantissaAndScaleFrom:'001' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1326
     Number readMantissaAndScaleFrom:'0001' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1327
     Number readMantissaAndScaleFrom:'000000000000000000000000000024' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1328
     Number readMantissaAndScaleFrom:'0000000000000000000000000000000000000000000024' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1329
     Number readMantissaAndScaleFrom:'123456789012345678901234567890' readStream radix:10. 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1330
     Number readMantissaAndScaleFrom:'1234567890123456789012345678901234567890' readStream radix:10. 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1331
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1332
     Number readMantissaAndScaleFrom:'12345678901234567890' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1333
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1334
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1335
    "Modified: / 17-06-2017 / 03:03:03 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1336
    "Modified: / 22-07-2019 / 19:37:21 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1337
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1338
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1339
readMantissaFrom:aStream radix:radix
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1340
    "helper for readFrom: -
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1341
     return the mantissa (post-decimal-point digits)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1342
     from the (character-)stream aStream;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1343
     No whitespace is skipped."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1344
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1345
    ^ (self readMantissaAndScaleFrom:aStream radix:radix) first
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1346
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1347
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1348
     Number readMantissaFrom:'234'    readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1349
     Number readMantissaFrom:'2'      readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1350
     Number readMantissaFrom:'234567' readStream radix:10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1351
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1352
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1353
    "Modified: / 14.4.1998 / 18:47:47 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1354
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1355
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1356
!Number class methodsFor:'queries'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1357
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  1358
epsilon
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1359
    "return the maximum relative spacing of instances of mySelf
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  1360
     (i.e. the value-delta of the least significant bit)"
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  1361
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  1362
     ^ self subclassResponsibility
8844
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  1363
!
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  1364
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1365
epsilonForCloseTo
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1366
    "return the epsilon used in the closeTo: comparison.
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1367
     (useful would be something like self epsilon or epsilon*10,
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1368
      but for Squeak compatibility.... - sigh)"
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1369
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1370
    ^ 0.0001
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1371
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1372
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1373
     Float epsilon
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1374
     ShortFloat epsilon
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1375
     Float epsilon10
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1376
     ShortFloat epsilon10
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1377
    "
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1378
!
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1379
8892
5d05a7f150a5 +isAbstract
Claus Gittinger <cg@exept.de>
parents: 8844
diff changeset
  1380
isAbstract
11224
a9a66cee404f comment
Claus Gittinger <cg@exept.de>
parents: 11136
diff changeset
  1381
    "Return if this class is an abstract class.
a9a66cee404f comment
Claus Gittinger <cg@exept.de>
parents: 11136
diff changeset
  1382
     True is returned for Number here; false for subclasses.
19457
8f56a5bde306 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19249
diff changeset
  1383
     Abstract subclasses must redefine this again."
11224
a9a66cee404f comment
Claus Gittinger <cg@exept.de>
parents: 11136
diff changeset
  1384
8892
5d05a7f150a5 +isAbstract
Claus Gittinger <cg@exept.de>
parents: 8844
diff changeset
  1385
    ^ self == Number
5d05a7f150a5 +isAbstract
Claus Gittinger <cg@exept.de>
parents: 8844
diff changeset
  1386
! !
5d05a7f150a5 +isAbstract
Claus Gittinger <cg@exept.de>
parents: 8844
diff changeset
  1387
7261
f35fc9cee675 method category rename
Claus Gittinger <cg@exept.de>
parents: 7214
diff changeset
  1388
!Number methodsFor:'Compatibility-Squeak'!
4988
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1389
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1390
asSmallAngleDegrees
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1391
    "Return the receiver normalized to lie within the range (-180, 180)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1392
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1393
    | pos |
4988
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1394
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1395
    pos := self \\ 360.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1396
    pos > 180 ifTrue: [pos := pos - 360].
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1397
    ^ pos
4988
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1398
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1399
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1400
     #(-500 -300 -150 -5 0 5 150 300 500 1200)
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1401
	collect: [:n | n asSmallAngleDegrees]
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1402
    "
6072
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  1403
!
4988
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1404
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1405
closeFrom:aNumber
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1406
    "are these two numbers close?
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1407
     Notice, that this is definitely not the best way to compensate
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1408
     for rounding errors - see isAlmostEqualTo:aNumber nEpsilon:nE
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1409
     (or at least, use closeFrom:withEpsilon:,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1410
      where the epsilon is given as arg)"
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1411
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1412
    ^ self closeFrom:aNumber withEpsilon:(self class epsilonForCloseTo)
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1413
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1414
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1415
     9.0 closeTo: 8.9999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1416
     9.9 closeTo: 9
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1417
     (9/3) closeTo: 2.9999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1418
     1 closeTo: 0.9999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1419
     1 closeTo: 1.0001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1420
     1 closeTo: 1.001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1421
     1 closeTo: 0.999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1422
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1423
     0.9999 closeTo: 1
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1424
     1.0001 closeTo: 1
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1425
     1.001 closeTo: 1
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1426
     0.999 closeTo: 1
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1427
     Float NaN closeTo:Float NaN
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1428
     Float infinity closeTo:Float infinity
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1429
    "
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1430
!
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1431
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1432
closeFrom:aNumber withEpsilon:eps
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1433
    "are these two numbers close?
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1434
     That is, within the given epsilon.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1435
     Notice, that this is probably not the best way to compensate
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1436
     for rounding errors - see isAlmostEqualTo:aNumber nEpsilon:nE
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1437
     (although it is useful to determine if a measured value
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1438
      is within its spec)"
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1439
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1440
    | fuzz |
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1441
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1442
    self isNaN == aNumber isNaN ifFalse: [^ false].
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1443
    self isInfinite == aNumber isInfinite ifFalse: [^ false].
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1444
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1445
    fuzz := (self abs max:aNumber abs) * eps.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1446
    fuzz isFinite ifFalse:[^ false].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1447
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1448
    ^ (self - aNumber) abs <= fuzz
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1449
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1450
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1451
     9.0 closeTo: 8.9999
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1452
     9.0 closeTo: 8.9999 withEpsilon:0.1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1453
     9.0 closeTo: 8.9999 withEpsilon:0.0001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1454
     9.0 closeTo: 8.9999 withEpsilon:0.00001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1455
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1456
     9.9 closeTo: 9
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1457
     9.9 closeTo: 9 withEpsilon:1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1458
     
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1459
     (9/3) closeTo: 2.9999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1460
     1 closeTo: 0.9999
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1461
     1 closeTo: 0.9999 withEpsilon:0.0001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1462
     1 closeTo: 0.9999 withEpsilon:0.00001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1463
     
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1464
     1 closeTo: 1.0001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1465
     1 closeTo: 1.001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1466
     1 closeTo: 0.999
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1467
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1468
     170 closeTo:(170 raisedTo:240)
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1469
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1470
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1471
    "Modified (comment): / 31-08-2018 / 12:24:39 / Claus Gittinger"
6335
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1472
!
8286bc57d05e closeTo: generalized for all numbers
Claus Gittinger <cg@exept.de>
parents: 6258
diff changeset
  1473
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1474
closeTo:num
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1475
    "are these two numbers close to each other?
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1476
     Notice, that this is definitely not the best way to compensate
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1477
     for rounding errors - see isAlmostEqualTo:aNumber nEpsilon:nE
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1478
     (or at least, use closeFrom:withEpsilon:,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1479
      where the epsilon is given as arg)"
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1480
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1481
    ^ self closeTo:num withEpsilon:(self class epsilonForCloseTo)
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1482
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1483
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1484
     1 closeTo:1.0000000001
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1485
     1 closeTo:1.001
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1486
     1 closeTo:1.001 withEpsilon:0.001
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1487
    "
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1488
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1489
    "Created: / 5.11.2001 / 18:07:26 / cg"
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1490
!
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1491
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1492
closeTo:num withEpsilon:eps
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1493
    "are these two numbers close to each other?
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1494
     Notice, that this is probably not the best way to compensate
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1495
     for rounding errors - see isAlmostEqualTo:aNumber nEpsilon:nE
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1496
     (although it is useful to determine if a measured value
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1497
      is within its spec)"
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1498
6374
fad888313ce3 closeTo: fix
Claus Gittinger <cg@exept.de>
parents: 6345
diff changeset
  1499
    num isNumber ifFalse:[^false].
10727
4e6346eb48a9 closeTo: with epsilon parameter
sr
parents: 10556
diff changeset
  1500
    ^ num closeFrom:self withEpsilon:eps
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1501
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1502
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1503
     1 closeTo:1.0000000001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1504
     1 closeTo:1.001
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1505
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1506
     1 closeTo:1.001 withEpsilon:0.1
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1507
     1 closeTo:1.201 withEpsilon:0.1
12979
917a726bf375 comment/format in: #closeTo:withEpsilon:
Claus Gittinger <cg@exept.de>
parents: 12762
diff changeset
  1508
917a726bf375 comment/format in: #closeTo:withEpsilon:
Claus Gittinger <cg@exept.de>
parents: 12762
diff changeset
  1509
     3.14 closeTo:(3.14 asFixedPoint:2)
917a726bf375 comment/format in: #closeTo:withEpsilon:
Claus Gittinger <cg@exept.de>
parents: 12762
diff changeset
  1510
     (3.14 asFixedPoint:2) closeTo:3.14
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1511
    "
6155
00eaf2fa55bc isReal comment
Claus Gittinger <cg@exept.de>
parents: 6154
diff changeset
  1512
12979
917a726bf375 comment/format in: #closeTo:withEpsilon:
Claus Gittinger <cg@exept.de>
parents: 12762
diff changeset
  1513
    "Created: / 05-11-2001 / 18:07:26 / cg"
917a726bf375 comment/format in: #closeTo:withEpsilon:
Claus Gittinger <cg@exept.de>
parents: 12762
diff changeset
  1514
    "Modified: / 02-08-2010 / 13:27:22 / cg"
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1515
!
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  1516
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1517
isEqual: aNumber within: accuracy
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1518
     "Notice, that this is probably not the best way to compensate
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1519
     for rounding errors - see isAlmostEqualTo:aNumber nEpsilon:nE
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1520
     (although it is useful to determine if a measured value
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1521
      is within its spec)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1522
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1523
    ^ (self - aNumber) abs < accuracy
17127
f2611d8d0ce0 class: Number
Claus Gittinger <cg@exept.de>
parents: 17060
diff changeset
  1524
!
f2611d8d0ce0 class: Number
Claus Gittinger <cg@exept.de>
parents: 17060
diff changeset
  1525
14495
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1526
rounded:n
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1527
    "Answer the float rounded with n digits of precision"
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1528
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1529
    | mult |
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1530
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1531
    mult := 10 raisedTo: n.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1532
    ^ (((self * mult) rounded) asLimitedPrecisionReal / mult).
14495
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1533
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1534
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1535
     7 rounded:2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1536
     7.1 rounded:2
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1537
     7.2345 rounded:2  -> 7.23 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1538
     7.2385 rounded:2  -> 7.24 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1539
     7.2341 rounded:3  -> 7.234
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1540
     7.2345 rounded:3
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1541
     7.2348 rounded:3
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1542
     (1/3) rounded:3   -> 0.333
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1543
     (2/3) rounded:3   -> 0.667
14495
d5afe5bc91f7 added: #rounded:
Claus Gittinger <cg@exept.de>
parents: 14009
diff changeset
  1544
    "
4988
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1545
! !
ac426684e852 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4895
diff changeset
  1546
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1547
!Number methodsFor:'coercing & converting'!
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1548
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1549
i
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1550
    "return a complex number, with the receiver as imaginary part, 0 as real part"
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1551
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1552
    ^ Complex real:0 imaginary:self
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1553
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1554
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1555
     3i     -> (0+3i)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1556
     (1+1i) -> (1+1i)
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1557
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1558
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1559
    "Modified (format): / 22-09-2017 / 09:53:27 / cg"
9127
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1560
! !
04cd80c64a30 decimapPointCharacter stuff;
Claus Gittinger <cg@exept.de>
parents: 8979
diff changeset
  1561
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1562
!Number methodsFor:'comparing'!
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1563
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1564
epsilonForCloseTo
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1565
    "return the epsilon used in the closeTo: comparison."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1566
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1567
    ^ self class epsilonForCloseTo
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1568
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1569
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1570
     1.0 epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1571
     10 asShortFloat epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1572
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1573
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1574
    "Created: / 10-06-2019 / 21:20:18 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1575
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1576
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1577
isAlmostEqualTo:aNumber nEpsilon:nE
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1578
    "return true, if the argument, aNumber represents almost the same numeric value
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1579
     as the receiver, false otherwise.
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1580
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1581
     nE is the number of minimal float distances, that the numbers may differ and
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1582
     still be considered equal. 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1583
     See documentation in LimitedPrecisionReal for more detail.
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1584
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1585
     For background information why floats need this
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1586
     read: http://randomascii.wordpress.com/2012/02/25/comparing-floating-point-numbers-2012-edition/
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1587
    "
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1588
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1589
    |f1 f2 diff scaledEpsilon largest|
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1590
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1591
    diff := (self - aNumber) abs.
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1592
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1593
    scaledEpsilon := nE * diff class epsilon.
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1594
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1595
    diff <= scaledEpsilon ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1596
        "compare for really close values near 0"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1597
        ^ true.
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1598
    ].
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1599
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1600
    "scaled comparison for larger values"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1601
    f1 := self abs.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1602
    f2 := aNumber abs.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1603
    largest := f1 > f2 ifTrue:[f1] ifFalse:[f2].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1604
    ^ (diff <= (scaledEpsilon * largest)).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1605
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1606
    "Modified: / 15-06-2017 / 09:55:15 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1607
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1608
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1609
isAlmostEqualTo:aNumber withError:errFraction
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1610
    "return true, if the receiver,is inside the interval 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1611
     aNumber-err .. aNumber+err.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1612
     Err should be a fraction of 0..1."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1613
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1614
    ^ self between:(aNumber * (1-errFraction)) and:(aNumber * (1+errFraction))
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1615
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1616
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1617
     within 10%?
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1618
     10.5 isAlmostEqualTo:10 withError:0.1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1619
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1620
     within 1%
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1621
     10.5 isAlmostEqualTo:10 withError:0.01
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1622
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1623
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1624
    "Created: / 23-09-2017 / 16:33:26 / cg"
16656
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1625
! !
9d93ee3916f6 class: Number
Stefan Vogel <sv@exept.de>
parents: 16630
diff changeset
  1626
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1627
!Number methodsFor:'converting'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1628
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1629
% aNumber
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1630
    "Return a complex number with the receiver as the real part and
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1631
     aNumber as the imaginary part"
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1632
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1633
    ^ Complex real:self imaginary:aNumber
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1635
    "Modified: / 9.7.1998 / 10:18:12 / cg"
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1636
!
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1637
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1638
+/- anError
14009
a2b68a9c9719 comment
Claus Gittinger <cg@exept.de>
parents: 13898
diff changeset
  1639
    "return a MeasurementValue with a given error."
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1640
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1641
    ^ MeasurementValue value:self minValue:(self-anError) maxValue:(self+anError)
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1642
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1643
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1644
     (100 +/- 5) * 2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1645
     (100 +/- 5) * (100 +/- 10)
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1646
     (100 +/- 5) + (100 +/- 10)
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1647
     (100 +/- 5) - (100 +/- 10)
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1648
    "
14009
a2b68a9c9719 comment
Claus Gittinger <cg@exept.de>
parents: 13898
diff changeset
  1649
a2b68a9c9719 comment
Claus Gittinger <cg@exept.de>
parents: 13898
diff changeset
  1650
    "Modified (comment): / 14-02-2012 / 14:17:36 / cg"
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1651
!
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  1652
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1653
@ aNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1654
    "return a Point with the receiver as x-coordinate and the argument
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1655
     as y-coordinate"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1656
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1657
%{  /* NOCONTEXT */
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1658
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1659
    /*
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1660
     * I cannot tell if this special code is worth anything
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1661
     */
5322
411b6c0f7250 renamed sone structures;
Claus Gittinger <cg@exept.de>
parents: 5299
diff changeset
  1662
    if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1663
	OBJ newPoint;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1664
	int spc;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1665
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1666
	__qCheckedNew(newPoint, sizeof(struct __Point));
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1667
	__InstPtr(newPoint)->o_class = @global(Point);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1668
	__qSTORE(newPoint, @global(Point));
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1669
	__PointInstPtr(newPoint)->p_x = self;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1670
	__PointInstPtr(newPoint)->p_y = aNumber;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1671
	if (! __bothSmallInteger(self, aNumber)) {
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1672
	    spc = __qSpace(newPoint);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1673
	    __STORE_SPC(newPoint, aNumber, spc);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1674
	    __STORE_SPC(newPoint, self, spc);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1675
	}
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1676
	RETURN ( newPoint );
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1677
    }
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1678
%}
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1679
.
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1680
    ^ Point x:self y:aNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1681
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1682
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1683
asComplex
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1684
    "Return a complex number with the receiver as the real part and
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1685
     zero as the imaginary part"
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1686
7356
fe8fb0a571f2 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
  1687
    ^ Complex real:self
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1688
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1689
    "Modified: / 9.7.1998 / 10:18:16 / cg"
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1690
!
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  1691
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1692
asMetaNumber
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1693
    self isNaN ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1694
        ^ NotANumber NaN
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1695
    ].    
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1696
    ^ SomeNumber new realNumber:self
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1697
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1698
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1699
     Float NaN asMetaNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1700
     Float infinity asMetaNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1701
     Float negativeInfinity asMetaNumber
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1702
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1703
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1704
    "Modified (comment): / 21-06-2017 / 20:47:59 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1705
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  1706
7214
2315f1d48b84 *** empty log message ***
martin
parents: 6899
diff changeset
  1707
asNumber
17060
7b39761eb1ce class: Number
Claus Gittinger <cg@exept.de>
parents: 17058
diff changeset
  1708
    "I am a number, so return myself"
7214
2315f1d48b84 *** empty log message ***
martin
parents: 6899
diff changeset
  1709
2315f1d48b84 *** empty log message ***
martin
parents: 6899
diff changeset
  1710
    ^ self.
2315f1d48b84 *** empty log message ***
martin
parents: 6899
diff changeset
  1711
!
2315f1d48b84 *** empty log message ***
martin
parents: 6899
diff changeset
  1712
19702
79ea925e1f35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19701
diff changeset
  1713
asPercentFrom:fullAmount
79ea925e1f35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19701
diff changeset
  1714
    "what is the percentage
79ea925e1f35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19701
diff changeset
  1715
     taking the receiver's value from the argument"
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1716
19702
79ea925e1f35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19701
diff changeset
  1717
    ^ (self / fullAmount) * 100.
19701
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1718
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1719
    "
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1720
     20 asPercentFrom:100
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1721
     (10 asPercentFrom:156) asFixedPoint:2
19702
79ea925e1f35 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19701
diff changeset
  1722
     (15.6 asPercentFrom:156) asFixedPoint:2
19701
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1723
    "
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1724
!
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1725
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1726
asPoint
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1727
    "return a new Point with the receiver as all coordinates;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1728
     often used to supply the same value in two dimensions, as with
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1729
     symmetrical gridding or scaling."
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1730
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1731
%{  /* NOCONTEXT */
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1732
5322
411b6c0f7250 renamed sone structures;
Claus Gittinger <cg@exept.de>
parents: 5299
diff changeset
  1733
    if (__CanDoQuickNew(sizeof(struct __Point))) {      /* OBJECT ALLOCATION */
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1734
	OBJ newPoint;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1735
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1736
	__qCheckedNew(newPoint, sizeof(struct __Point));
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1737
	__InstPtr(newPoint)->o_class = @global(Point);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1738
	__qSTORE(newPoint, @global(Point));
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1739
	__PointInstPtr(newPoint)->p_x = self;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1740
	__PointInstPtr(newPoint)->p_y = self;
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1741
	__STORE(newPoint, self);
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1742
	RETURN ( newPoint );
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1743
    }
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1744
%}.
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1745
    ^ Point x:self y:self
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1746
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1747
13898
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1748
asTimeDuration
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1749
    "return an TimeDuration object from the receiver, 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1750
     taking the receiver as number of seconds"
13898
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1751
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1752
    ^ TimeDuration seconds:self
13898
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1753
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1754
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1755
     5 asTimeDuration
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1756
     50.25 asTimeDuration
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1757
     3600 asTimeDuration
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1758
     '5m' asTimeDuration
13898
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1759
    "
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1760
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1761
    "Created: / 08-01-2012 / 19:04:04 / cg"
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1762
    "Modified (comment): / 21-01-2019 / 10:31:15 / Claus Gittinger"
13898
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1763
!
42fd67913187 added: #asTimeDuration
Claus Gittinger <cg@exept.de>
parents: 13631
diff changeset
  1764
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1765
degreesToRadians
21105
f51ebd03d20b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20866
diff changeset
  1766
    "interpreting the receiver as degrees, return the radians"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1767
8203
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  1768
    ^ self * (Float pi / 180.0)
7388
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1769
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1770
    "
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1771
     180 degreesToRadians
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1772
     Float pi radiansToDegrees
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1773
    "
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1774
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1775
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1776
literalArrayEncoding
1245
c8afea3d5af0 commentary
Claus Gittinger <cg@exept.de>
parents: 1210
diff changeset
  1777
    "encode myself as an array literal, from which a copy of the receiver
c8afea3d5af0 commentary
Claus Gittinger <cg@exept.de>
parents: 1210
diff changeset
  1778
     can be reconstructed with #decodeAsLiteralArray."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1779
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1780
    ^ self
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1781
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1782
    "Modified: 1.9.1995 / 02:25:26 / claus"
1245
c8afea3d5af0 commentary
Claus Gittinger <cg@exept.de>
parents: 1210
diff changeset
  1783
    "Modified: 22.4.1996 / 13:00:27 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1784
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1785
19701
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1786
percentOf:hundredPercent
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1787
    "how many is self-percent from the argument"
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1788
19701
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1789
    ^ (hundredPercent / 100 * self)
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1790
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1791
    "
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1792
     20 percentOf:100
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1793
     (10 percentOf:156) asFixedPoint:2
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1794
     (105 percentOf:156) asFixedPoint:2
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1795
    "
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1796
!
92aff12989fa #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19457
diff changeset
  1797
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1798
radiansToDegrees
21105
f51ebd03d20b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20866
diff changeset
  1799
    "interpreting the receiver as radians, return the degrees"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1800
8203
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  1801
    ^ self * (180.0 / Float pi)
7388
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1802
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1803
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1804
     180 degreesToRadians
7388
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1805
     Float pi radiansToDegrees
bb89a53e2682 fixed conversion from string to not loose precision which is later
Claus Gittinger <cg@exept.de>
parents: 7356
diff changeset
  1806
    "
6637
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1807
!
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1808
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1809
withScale:newScale
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1810
    "return a fixedPoint number representing the same value as the receiver,
6637
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1811
     with newScale number of post-decimal digits"
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1812
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1813
    ^ self asFixedPoint:newScale
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1814
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1815
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1816
     1234 withScale:2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1817
     1234.1 withScale:2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1818
     1234.12 withScale:2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1819
     1234.123 withScale:2
6637
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1820
     (1/7) withScale:2
b6ee031f3096 withScale moved up.
Claus Gittinger <cg@exept.de>
parents: 6632
diff changeset
  1821
    "
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1822
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  1823
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1824
!Number methodsFor:'converting-times'!
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1825
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1826
days
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1827
    "return a TimeDuration representing this number of days"
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1828
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1829
    ^ TimeDuration days:self
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1830
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1831
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1832
     1000 milliseconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1833
     10 seconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1834
     10 minutes
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1835
     1 days
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1836
    "
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1837
!
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1838
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1839
hours
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1840
    "return a TimeDuration representing this number of hours"
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1841
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1842
    ^ TimeDuration hours:self
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1843
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1844
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1845
     1000 milliseconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1846
     10 seconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1847
     10 minutes
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1848
    "
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1849
!
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1850
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1851
microseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1852
    "return a TimeDuration representing this number of microseconds."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1853
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1854
    ^ TimeDuration fromMicroseconds:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1855
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1856
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1857
     40 microseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1858
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1859
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1860
    "Modified (comment): / 21-09-2017 / 17:37:18 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1861
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1862
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1863
milliSeconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1864
    "return a TimeDuration representing this number of milliseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1865
     Same as milliseconds, for dialect compatibility"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1866
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1867
    ^ TimeDuration fromMilliseconds:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1868
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1869
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1870
     1000 milliSeconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1871
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1872
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1873
    "Created: / 21-09-2017 / 17:26:32 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1874
    "Modified (comment): / 18-07-2019 / 21:33:09 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1875
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1876
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1877
milliseconds
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1878
    "return a TimeDuration representing this number of milliseconds.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1879
     Same as milliSeconds, for dialect compatibility"
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1880
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1881
    ^ TimeDuration fromMilliseconds:self
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1882
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1883
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1884
     1000 milliseconds
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1885
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1886
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1887
    "Modified (comment): / 21-09-2017 / 17:37:18 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1888
    "Modified (comment): / 18-07-2019 / 21:33:12 / Claus Gittinger"
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1889
!
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1890
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1891
minutes
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1892
    "return a TimeDuration representing this number of minutes"
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1893
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1894
    ^ TimeDuration minutes:self
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1895
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1896
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1897
     1000 milliseconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1898
     10 seconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1899
     10 minutes
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1900
    "
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1901
!
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1902
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1903
nanoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1904
    "return a TimeDuration representing this number of nanoseconds."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1905
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1906
    ^ TimeDuration fromNanoseconds:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1907
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1908
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1909
     40.5 nanoseconds asPicoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1910
     (40.5 nanoseconds / 2) asPicoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1911
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1912
     40 nanoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1913
     40 nanoseconds asPicoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1914
     44 milliseconds asMicroseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1915
     44 milliseconds 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1916
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1917
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1918
    "Modified (comment): / 21-09-2017 / 17:37:18 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1919
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1920
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1921
picoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1922
    "return a TimeDuration representing this number of picoseconds."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1923
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1924
    ^ TimeDuration fromPicoseconds:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1925
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1926
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1927
     40 picoseconds
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1928
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1929
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1930
    "Modified (comment): / 21-09-2017 / 17:37:18 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1931
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1932
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1933
seconds
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1934
    "return a TimeDuration representing this number of seconds"
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1935
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1936
    ^ TimeDuration seconds:self
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1937
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1938
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1939
     1000 milliseconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1940
     10 seconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1941
     10 minutes
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1942
    "
13631
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1943
!
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1944
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1945
weeks
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1946
    "return a TimeDuration representing this number of weeks"
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1947
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1948
    ^ TimeDuration weeks:self
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1949
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1950
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1951
     1000 milliseconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1952
     10 seconds
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1953
     10 minutes
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1954
     1 days
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1955
     1 weeks
13631
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1956
    "
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1957
82875f651ca6 added: #weeks
Claus Gittinger <cg@exept.de>
parents: 12979
diff changeset
  1958
    "Created: / 05-09-2011 / 11:17:59 / cg"
11008
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1959
! !
5a92714a522b timeDuration conversions added
Michael Beyl <mb@exept.de>
parents: 10727
diff changeset
  1960
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1961
!Number methodsFor:'copying'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1962
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1963
deepCopyUsing:aDictionary postCopySelector:postCopySelector
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1964
    "return a deep copy of myself
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1965
     - reimplemented here since numbers are immutable"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1966
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1967
    ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1968
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1969
    "Modified (comment): / 23-05-2020 / 20:03:00 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1970
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1971
16406
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1972
!Number methodsFor:'double dispatching'!
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1973
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1974
differenceFromTimestamp:aTimestamp
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1975
    "I am to be interpreted as seconds, return the timestamp this number of seconds
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1976
     before aTimestamp"
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1977
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1978
    ^ aTimestamp subtractMilliseconds:(self * 1000) truncated.
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1979
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1980
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1981
     100.0 differenceFromTimestamp:Timestamp now
16406
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1982
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1983
     |t1 t2|
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  1984
     t1 := Timestamp now.
16406
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1985
     t2 := 1.5 differenceFromTimestamp:t1.
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1986
     t1 inspect. t2 inspect.
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1987
    "
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1988
! !
967b6c76169a class: Number
Stefan Vogel <sv@exept.de>
parents: 16267
diff changeset
  1989
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1990
!Number methodsFor:'inspecting'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1991
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1992
inspectorValueStringInListFor:anInspector
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1993
    "returns a string to be shown in the inspector's list"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1994
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1995
    ^ self printString contractTo:30
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1996
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1997
    "Created: / 29-05-2019 / 15:01:19 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1998
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  1999
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2000
!Number methodsFor:'intervals'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2001
6072
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2002
downTo:stop
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2003
    "return an interval from receiver down to the argument, incrementing by -1"
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2004
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2005
    ^ self to:stop by:-1
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2006
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2007
    "
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2008
     (10 downTo:1) do:[:i | Transcript showCR:i].
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2009
    "
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2010
!
55858717097a added #downTo:
Claus Gittinger <cg@exept.de>
parents: 5565
diff changeset
  2011
15595
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2012
downTo:stop by:step
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2013
    "return an interval from receiver down to the argument, decrementing by step"
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2014
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2015
    ^ self to:stop by:step negated
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2016
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2017
    "
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2018
     (10 downTo:1 by:0.5) do:[:i | Transcript showCR:i].
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2019
    "
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2020
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2021
    "Created: / 01-08-2013 / 14:36:56 / cg"
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2022
!
fa5010435cda class: Number
Claus Gittinger <cg@exept.de>
parents: 15197
diff changeset
  2023
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2024
to:stop
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2025
    "return an interval from receiver up to the argument, incrementing by 1"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2026
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2027
    ^ Interval from:self to:stop
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2028
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2029
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2030
to:stop by:step
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2031
    "return an interval from receiver up to the argument, incrementing by step"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2032
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2033
    ^ Interval from:self to:stop by:step
6154
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2034
!
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2035
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2036
to:stop byFactor:factor
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2037
    "return a geometric series from receiver up to the argument;
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2038
     elements have a constant factor in between"
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2039
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2040
    ^ GeometricSeries from:self to:stop byFactor:factor
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2041
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2042
    "
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2043
     (1 to:256 byFactor:2)
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2044
     (256 to:1 byFactor:1/2)
6154
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  2045
    "
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2046
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2047
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2048
!Number methodsFor:'iteration'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2049
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2050
timesRepeat:aBlock
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2051
    "evaluate the argument, aBlock self times"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2052
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2053
    |count|
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2054
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2055
    count := self.
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2056
    [count > 0] whileTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2057
	aBlock value.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2058
	count := count - 1
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2059
    ]
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2060
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2061
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2062
timesRepeatWithExit:aOneArgBlock
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2063
    "evaluate the argument, aBlock self times;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2064
     pass an exit block to the one-arg-block"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2065
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2066
    |count exit|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2067
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2068
    exit := [:values | ^ values firstIfEmpty:nil] asVarArgBlock.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2069
    count := self.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2070
    [count > 0] whileTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2071
        aOneArgBlock value:exit.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2072
        count := count - 1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2073
    ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2074
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2075
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2076
    10 timesRepeatWithExit:[:exit |
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2077
        Transcript showCR:'iteration'.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2078
        (Random nextBetween:1 and:10) > 7 ifTrue:[exit value].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2079
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2080
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2081
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2082
    "Created: / 28-06-2019 / 12:01:24 / Claus Gittinger"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2083
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2084
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2085
!Number methodsFor:'mathematical functions'!
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2086
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2087
agm:y
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2088
    "return the arithmetic-geometric mean agm(x, y) of the receiver (x) and the argument, y.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2089
     See https://en.wikipedia.org/wiki/Arithmetic-geometric_mean
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2090
     and http://www.wolframalpha.com/input/?i=agm(24,+6)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2091
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2092
    |ai an gi gn epsilon delta|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2093
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2094
    ai := (self + y) / 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2095
    gi := (self * y) sqrt.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2096
    epsilon := self epsilon.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2097
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2098
    [
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2099
        an := (ai + gi) / 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2100
        gn := (ai * gi) sqrt.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2101
        delta := (an - ai) abs.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2102
        ai := an.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2103
        gi := gn.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2104
    ] doUntil:[ delta < epsilon ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2105
    ^ ai
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2106
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2107
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2108
     24 agm:6
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2109
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2110
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2111
    "Created: / 03-07-2017 / 12:05:00 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2112
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2113
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2114
cbrt
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2115
    "return the cubic root of the receiver"
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2116
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2117
    "/ if I am not a Float (or a less general lpReal),
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2118
    "/ retry after converting to float
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2119
    (self isLimitedPrecisionReal not
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2120
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2121
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2122
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2123
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2124
            ^ f cbrt.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2125
        ].
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2126
    ].
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2127
    "/ very slow fallback
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2128
    ^ self cbrt_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2129
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2130
    "Modified: / 05-07-2017 / 17:23:27 / cg"
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2131
!
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2132
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2133
conjugated
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2134
    "Return the complex conjugate of this Number."
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2135
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2136
    ^ self
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2137
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2138
    "Modified: / 9.7.1998 / 10:17:31 / cg"
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2139
!
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2140
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2141
exp
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2142
    "compute e**x of the receiver"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2143
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2144
    "/ if I am not a Float (or a less general lpReal),
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2145
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2146
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2147
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2148
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2149
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2150
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2151
            ^ f exp.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2152
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2153
    ].
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2154
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  2155
    ^ self exp_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2156
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2157
    "Modified: / 05-07-2017 / 17:23:36 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2158
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2159
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2160
fibPhi
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2161
    ^ (1 / 5 sqrt) * ((self class phi raisedTo:self) - ((-1 / self class phi) raisedTo:self))
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2162
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2163
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2164
     3 fib      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2165
     3.0 fibPhi   
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2166
     100 fib     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2167
     100.0 fibPhi  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2168
    "
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2169
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2170
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2171
floorLog:radix
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2172
    "return the logarithm truncated as an integer"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2173
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2174
    ^ (self log:radix) floor
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2175
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2176
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2177
imaginary
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2178
    "Return the imaginary part of a complex number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2179
     For non-complex numbers, zero is returned."
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2180
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2181
    ^ 0
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2182
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2183
    "Modified: / 09-07-1998 / 10:17:24 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2184
    "Modified (comment): / 01-06-2018 / 13:09:09 / Claus Gittinger"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2185
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2186
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2187
ldexp:exp
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2188
    "multiply the receiver by an integral power of 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2189
     I.e. return self * (2 ^ exp).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2190
     This is also the operation to reconstruct the original float from its
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2191
     mantissa and exponent: (f mantissa ldexp:f exponent) = f"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2192
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2193
    ^ self * (2 raisedTo:exp)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2194
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2195
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2196
     1.0 ldexp:16  -> 65536.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2197
     1.0 ldexp:100 -> 1.26765060022823E+30
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2198
     1 * (2 raisedToInteger:100) -> 1267650600228229401496703205376
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2199
     1 ldexp:200   -> 1606938044258990275541962092341162602522202993782792835301376
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2200
     1.0 ldexp:200 -> 1.60693804425899E+60
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2201
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2202
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2203
    "Created: / 19-06-2017 / 01:43:35 / cg"
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2204
!
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2205
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2206
ln
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2207
    "return the natural logarithm of myself.
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2208
     Raises an exception, if the receiver is less or equal to zero."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2209
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2210
    "/ if I am not a Float (or a less general lpReal),
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2211
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2212
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2213
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2214
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2215
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2216
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2217
            ^ f ln.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2218
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2219
    ].
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2220
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  2221
    ^ self ln_withAccuracy:self epsilon
19249
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2222
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2223
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2224
     (10 raisedTo:1000) ln
19249
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2225
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2226
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2227
    "Modified: / 05-07-2017 / 17:23:50 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2228
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2229
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2230
log
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2231
    "return log base 10 of the receiver.
12584
d32f98e9b219 comment/format in: #log
Claus Gittinger <cg@exept.de>
parents: 12112
diff changeset
  2232
     Alias for log:10."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2233
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2234
    ^ self log10
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2235
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2236
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2237
log10
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2238
    "return log base-10 of the receiver.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2239
     Raises an exception, if the receiver is less or equal to zero.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2240
     Here, fallback to the general logarithm code."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2241
10550
0f2a07595d1c Fix bug 641: changed #log10 to be more accurate
Stefan Vogel <sv@exept.de>
parents: 10325
diff changeset
  2242
    (self isLimitedPrecisionReal not
0f2a07595d1c Fix bug 641: changed #log10 to be more accurate
Stefan Vogel <sv@exept.de>
parents: 10325
diff changeset
  2243
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2244
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2245
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2246
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2247
            ^ f log10.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2248
        ].
10550
0f2a07595d1c Fix bug 641: changed #log10 to be more accurate
Stefan Vogel <sv@exept.de>
parents: 10325
diff changeset
  2249
    ].
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2250
    ^ self ln / self class ln10
19249
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2251
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2252
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2253
     (10 raisedTo:1000) log10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2254
     (10 raisedTo:2000) log10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2255
     (10 raisedTo:4000) log10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2256
     (10 raisedTo:8000) log10
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2257
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2258
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2259
    "Modified: / 05-07-2017 / 17:23:06 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2260
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2261
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2262
log2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2263
    "return log base-2 of the receiver.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2264
     Raises an exception, if the receiver is less or equal to zero.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2265
     Here, fallback to the general logarithm code."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2266
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2267
    (self isLimitedPrecisionReal not
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2268
    or:[self generality < 1.0 generality]) ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2269
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2270
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2271
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2272
            ^ f log2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2273
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2274
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2275
    ^ self ln / self class ln2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2276
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2277
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2278
     2.0 log2  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2279
     4.0 log2  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2280
     (2.0 raisedTo:100.0) log2  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2281
     (10 raisedTo:1000) log2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2282
     (10 raisedTo:2000) log2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2283
     (10 raisedTo:4000) log2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2284
     (10 raisedTo:8000) log2
19249
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2285
    "
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2286
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2287
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2288
log:aNumber
18850
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
  2289
    "return log base aNumber of the receiver.
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
  2290
     This will usually return a float value"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2291
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2292
    ^ self ln / aNumber ln
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2293
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2294
    "
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2295
      1000 log:10
19049
7ab1aa4ef01e #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19041
diff changeset
  2296
      9 log:3
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2297
      (1000 log:10) floor
19249
Stefan Vogel <sv@exept.de>
parents: 19141
diff changeset
  2298
      (10 raisedTo:1000) log:10
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2299
    "
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2300
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2301
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2302
nthRoot:n
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2303
    "return the nth root of the receiver"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2304
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2305
    n == 2 ifTrue:[^ self sqrt ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2306
    n == 3 ifTrue:[^ self cbrt ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2307
    "/ slow fallback
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2308
    ^ self nthRoot:n withAccuracy:self epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2309
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2310
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2311
     10 nthRoot:2 -> 3.16227766016838
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2312
     10 nthRoot:3 -> 2.154434690031883722
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2313
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2314
     100.0 nthRoot:4 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2315
     100.0 nthRoot:5
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2316
     (100.0 nthRoot:6) raisedTo:6
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2317
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2318
     16.0 nthRoot:2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2319
     -16.0 nthRoot:3
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2320
     -16.0 nthRoot:5
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2321
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2322
     -16.0 nthRoot:4
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2323
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2324
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2325
    "Created: / 25-07-2017 / 16:15:11 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2326
    "Modified (comment): / 22-09-2017 / 10:15:33 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2327
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2328
7468
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2329
raisedTo:aNumber
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2330
    "return the receiver raised to aNumber"
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2331
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2332
    aNumber = 0 ifTrue:[^ 1].
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2333
    aNumber = 1 ifTrue:[^ self].
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2334
    aNumber isInteger ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2335
	^ self raisedToInteger:aNumber
7468
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2336
    ].
19018
441811c95c15 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 18863
diff changeset
  2337
    aNumber isNumber ifFalse:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2338
	^ aNumber raisedFromNumber:self.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2339
    ].
7468
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2340
    ^ self asFloat raisedTo:aNumber
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2341
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2342
    "
19092
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2343
     2 raisedTo: 4
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2344
     -2 raisedTo: 4
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2345
     4 raisedTo: 1/2
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2346
     -4 raisedTo: 1/2
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2347
     8 raisedTo: 1/3
4a5b5b1e6f36 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 19049
diff changeset
  2348
     -8 raisedTo: 1/3
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2349
     10 raisedTo: 4
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2350
     10 raisedTo: -4
7468
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2351
    "
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2352
!
61c8a3053bf4 moved math functions to number
Claus Gittinger <cg@exept.de>
parents: 7456
diff changeset
  2353
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2354
real
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2355
    "Return the real part of a complex number.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2356
     For non-complex numbers, the receiver is returned."
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2357
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2358
    ^ self
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2359
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2360
    "Modified: / 09-07-1998 / 10:17:17 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2361
    "Modified (comment): / 01-06-2018 / 13:09:33 / Claus Gittinger"
6258
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2362
!
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2363
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2364
sqrt
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2365
    "return the square root of the receiver"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2366
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2367
    "/ if I am not a Float (or a less general lpReal),
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2368
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2369
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2370
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2371
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2372
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2373
        "/ do not make this a LongFloat;
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2374
        "/ it will return a LongFloat then, and Image rotated will fail then...
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2375
        (f := self asFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2376
            ^ f sqrt.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2377
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2378
    ].
19770
024784e1852b #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19769
diff changeset
  2379
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  2380
    ^ self sqrt_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2381
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2382
    "Modified (format): / 11-07-2017 / 13:32:02 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2383
    "Modified (format): / 26-07-2017 / 12:30:16 / mawalch"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2384
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2385
10191
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2386
sqrtWithErrorLessThan:epsilon
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2387
    "compute the square root, using the Newton method.
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2388
     The approximated return value has an error less than the given epsilon."
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2389
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2390
    ^ self sqrt_withAccuracy:epsilon
10191
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2391
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2392
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2393
     (2 asFixedPoint:4) sqrtWithErrorLessThan:0.001
10191
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2394
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2395
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2396
    "Modified: / 25-07-2017 / 15:58:46 / cg"
10191
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2397
!
4974027704a5 sqrtWithErrorLessThan:
Claus Gittinger <cg@exept.de>
parents: 9333
diff changeset
  2398
6258
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2399
timesTwoPower:anInteger
12762
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2400
    "Return the receiver multiplied by 2 raised to the power of the argument.
6258
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2401
     For protocol completeness wrt. Squeak and ST80."
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2402
12762
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2403
    anInteger >= 0 ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2404
        ^ self * (1 bitShift:anInteger)
12762
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2405
    ].
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2406
    ^ self / (1 bitShift:anInteger negated)
6258
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2407
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2408
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2409
     123 timesTwoPower:0  = 123*1 -> 123
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2410
     123 timesTwoPower:1  = 123*2 -> 246
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2411
     123 timesTwoPower:2  = 123*4 -> 492
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2412
     123 timesTwoPower:3  = 123*8 -> 984
12762
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2413
a41a496d8c61 changed: #timesTwoPower:
Claus Gittinger <cg@exept.de>
parents: 12759
diff changeset
  2414
     (2 timesTwoPower: -150) timesTwoPower: 150  -> 2
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2415
     (2 timesTwoPower: 150) timesTwoPower: -150  -> 2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2416
     (2 timesTwoPower: 150) timesTwoPower: -149  -> 4  
6258
435600a44e73 added timesTwoPower.
Claus Gittinger <cg@exept.de>
parents: 6195
diff changeset
  2417
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2418
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2419
    "Modified (comment): / 26-05-2019 / 03:26:09 / Claus Gittinger"
3634
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2420
! !
bbf443dce0cf complex conversion stuff
Claus Gittinger <cg@exept.de>
parents: 3613
diff changeset
  2421
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2422
!Number methodsFor:'measurement values'!
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2423
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2424
maxValue
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2425
    "the maximum possible value taking me as a measurement with possible error;
20421
5c1194f503ab #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20331
diff changeset
  2426
     as I am exact, that's myself"
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2427
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2428
    ^ self
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2429
!
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2430
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2431
minValue
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2432
    "the minimum possible value taking me as a measurement with possible error;
20421
5c1194f503ab #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20331
diff changeset
  2433
     as I am exact, that's myself"
11458
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2434
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2435
    ^ self
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2436
! !
d668f83e44d1 measurement support
Claus Gittinger <cg@exept.de>
parents: 11224
diff changeset
  2437
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2438
!Number methodsFor:'printing & storing'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2439
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2440
displayOn:aGCOrStream
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2441
    "return a string to display the receiver.
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2442
     The output radix is usually 10, but can be changed by setting
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2443
     DefaultDisplayRadix (see Integer>>displayRadix:)"
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2444
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2445
    "/ what a kludge - Dolphin and Squeak mean: printOn: a stream;
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2446
    "/ old ST80 means: draw-yourself on a GC.
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2447
    (aGCOrStream isStream) ifFalse:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2448
        ^ super displayOn:aGCOrStream
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2449
    ].
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2450
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2451
    (DefaultDisplayRadix isNil or:[DefaultDisplayRadix == 10]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2452
        self printOn:aGCOrStream
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2453
    ] ifFalse:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2454
        self printOn:aGCOrStream base:DefaultDisplayRadix showRadix:true.
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2455
    ].
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2456
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2457
    "
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2458
     Integer displayRadix:16. 12345
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2459
     Integer displayRadix:2.  12345
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2460
     Integer displayRadix:10. 12345
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2461
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2462
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2463
    "Modified (comment): / 22-02-2017 / 16:52:16 / cg"
18863
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2464
!
0fe8c5ecd2fd #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18862
diff changeset
  2465
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2466
printOn:aStream
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2467
    "append a printed description of the receiver to aStream"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2468
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2469
    self printOn:aStream base:10
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2470
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2471
    "Modified: / 20.1.1998 / 14:10:45 / stefan"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2472
!
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2473
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2474
printOn:aStream base:b
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2475
    "return a string representation of the receiver in the specified
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2476
     radix (without the initial XXr)"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2477
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2478
    ^ self printOn:aStream base:b showRadix:false
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2479
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2480
    "
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2481
     10 printOn:Transcript base:3
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2482
     31 printOn:Transcript base:3
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2483
     -20 printOn:Transcript base:16
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2484
     -20 printOn:Transcript base:10
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2485
     3000 factorial printOn:Transcript base:10
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2486
    "
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2487
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2488
    "Modified: / 20.1.1998 / 18:05:02 / stefan"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2489
    "Modified: / 7.9.2001 / 13:52:17 / cg"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2490
!
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2491
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2492
printOn:aStream base:b showRadix:showRadix
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2493
    "the central print method for integer.
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2494
     Must be defined in concrete classes"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2495
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2496
    self subclassResponsibility
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2497
!
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2498
5299
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2499
printOn:aStream paddedWith:padCharacter to:size base:radix
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2500
    |s|
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2501
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  2502
    radix == 10 ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2503
	s := self printString.
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  2504
    ] ifFalse:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2505
	s := self printStringRadix:radix.
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  2506
    ].
5299
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2507
    s printOn: aStream leftPaddedTo:size with: padCharacter
11098
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2508
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2509
    "
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2510
     100 printOn:Transcript paddedWith:$0 to:10 base:10.     Transcript cr.
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2511
     100 printOn:Transcript paddedWith:$0 to:10 base:16.     Transcript cr.
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2512
     100 printOn:Transcript paddedWith:(Character space) to:10 base:16.     Transcript cr.
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2513
     100 printOn:Transcript paddedWith:(Character space) to:10 base:2.     Transcript cr.
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2514
    "
8301
74d9ee379019 decimalPointCharacter definition
werner
parents: 8203
diff changeset
  2515
!
5299
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2516
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2517
printOn:aStream thousandsSeparator:thousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2518
    "print the receiver as business number with thousands separator to aStream.
11136
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2519
     thousandsSeparator is locale specific and is usualy a single quote ('), a comma or period."
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2520
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2521
    |rest|
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2522
11594
5440d97af571 #printStringWithThousandsSeparator fix for non-integers
Stefan Vogel <sv@exept.de>
parents: 11526
diff changeset
  2523
    self >= 1000 ifTrue:[
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2524
	(self // 1000) printOn:aStream thousandsSeparator:thousandsSeparator.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2525
	thousandsSeparator printOn:aStream.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2526
	rest := self \\ 1000.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2527
	rest < 100 ifTrue:[
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2528
	    aStream nextPut:$0.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2529
	    rest < 10 ifTrue:[
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2530
		aStream nextPut:$0.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2531
	    ].
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2532
	].
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2533
	rest printOn:aStream.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2534
	^ self.
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2535
    ].
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2536
    self printOn:aStream.
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2537
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2538
    "
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2539
     swiss style:
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2540
     1000000 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2541
     12345678 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2542
     1234567 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2543
     123456 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
11136
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2544
     123056 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2545
     12345 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2546
     1234 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2547
     123 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2548
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2549
     (12345678.12 asFixedPoint:2) printOn:Transcript thousandsSeparator:$'.     Transcript cr.
11136
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2550
     1234567.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2551
     123456.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2552
     123056.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2553
     12345.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2554
     1234.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2555
     123.12 printOn:Transcript thousandsSeparator:$'.     Transcript cr.
ac25ee31e086 fix printOn:thousandsSeparator when there is a 0 behind a separator
Stefan Vogel <sv@exept.de>
parents: 11098
diff changeset
  2556
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2557
     us style:
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2558
     1000000 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2559
     12345678 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2560
     1234567 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2561
     123456 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2562
     12345 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2563
     1234 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2564
     123 printOn:Transcript thousandsSeparator:$,.     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2565
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2566
     german (european ?) style
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2567
     1000000 printOn:Transcript thousandsSeparator:$..     Transcript cr.
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2568
     12345678 printOn:Transcript thousandsSeparator:$..     Transcript cr.
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2569
     1234567 printOn:Transcript thousandsSeparator:$..     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2570
     123456 printOn:Transcript thousandsSeparator:$..     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2571
     12345 printOn:Transcript thousandsSeparator:$..     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2572
     1234 printOn:Transcript thousandsSeparator:$..     Transcript cr.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2573
     123 printOn:Transcript thousandsSeparator:$..     Transcript cr.
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2574
    "
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2575
!
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2576
11660
62a726d91255 new: #printStringFormat:
Stefan Vogel <sv@exept.de>
parents: 11594
diff changeset
  2577
printStringFormat:formatString
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2578
    "Return a printed representation of the receiver as specified by formatString,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2579
     which is defined by PrintfScanf."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2580
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2581
    ^ PrintfScanf printf:formatString argument:self.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2582
    "/ ^ self printfPrintString:formatString
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2583
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2584
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2585
     1.2345 printStringFormat:'%4.2f' -> '1.23'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2586
     123 printStringFormat:'%4d' -> ' 123'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2587
     123 printStringFormat:'%5.2f' -> '123.0'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2588
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2589
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2590
    "Modified (comment): / 03-06-2018 / 09:15:01 / Claus Gittinger"
11660
62a726d91255 new: #printStringFormat:
Stefan Vogel <sv@exept.de>
parents: 11594
diff changeset
  2591
!
62a726d91255 new: #printStringFormat:
Stefan Vogel <sv@exept.de>
parents: 11594
diff changeset
  2592
20142
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2593
printStringRadix:base
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2594
    "return a string representation of the receiver in the specified
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2595
     base; does NOT prepend XXr to the string.
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2596
     See also: radixPrintStringRadix:
20331
f9e364521eda #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20308
diff changeset
  2597
               printOn:base:showRadix:"
20142
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2598
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2599
    ^ self printStringRadix:base showRadix:false
11098
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2600
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2601
    "
20331
f9e364521eda #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20308
diff changeset
  2602
     10000000000000000000000000000000000000000000 printStringRadix:16    
f9e364521eda #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20308
diff changeset
  2603
     -10000000000000000000000000000000000000000000 printStringRadix:16   
11098
bfc609a33e11 comments
Claus Gittinger <cg@exept.de>
parents: 11097
diff changeset
  2604
    "
5299
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2605
!
92b363dbd833 added #printOn:paddedWith:to:base:
Claus Gittinger <cg@exept.de>
parents: 5238
diff changeset
  2606
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2607
printStringRadix:base showRadix:showRadixBoolean
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2608
    "return a string representation of the receiver in the specified base; 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2609
     optionally prepend XXr to the string.
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2610
     See also: radixPrintStringRadix:
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2611
               printOn:base:showRadix:"
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2612
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2613
    |s|
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2614
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2615
    s := WriteStream on:(String basicNew:20).
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2616
    self printOn:s base:base showRadix:showRadixBoolean.
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2617
    ^ s contents
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2618
20142
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2619
    "
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2620
     10000000000000000000000000000000000000000000 printStringRadix:16 showRadix:false
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2621
     10000000000000000000000000000000000000000000 printStringRadix:16 showRadix:true
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2622
    "
c1ec3253b3c1 #REFACTORING by stefan
Stefan Vogel <sv@exept.de>
parents: 19770
diff changeset
  2623
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2624
    "Created: / 23-09-2011 / 13:59:19 / cg"
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2625
    "Modified (comment): / 22-06-2018 / 09:56:17 / Claus Gittinger"
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2626
!
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2627
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2628
printStringWithThousandsSeparator
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2629
    "print the receiver as swiss business number with thousands separator to aStream.
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2630
     Caveat: Should use the separator from the locale here"
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2631
20866
076ab5e1f702 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20421
diff changeset
  2632
    ^ self printStringWithThousandsSeparator:(UserPreferences current thousandsSeparatorCharacter).
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2633
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2634
    "
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2635
     1000000 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2636
     12345678 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2637
     1234567 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2638
     123456 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2639
     12345 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2640
     1234 printStringWithThousandsSeparator
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2641
     123 printStringWithThousandsSeparator
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2642
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2643
     1000000 asFixedPoint printStringWithThousandsSeparator
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2644
     12345678 asFixedPoint printStringWithThousandsSeparator
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2645
     1234567 asFixedPoint printStringWithThousandsSeparator
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2646
     123456 asFixedPoint printStringWithThousandsSeparator
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2647
     12345 asFixedPoint printStringWithThousandsSeparator
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2648
     1234 asFixedPoint printStringWithThousandsSeparator
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2649
     123 asFixedPoint printStringWithThousandsSeparator
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2650
     ((9999999//10000) asFixedPoint:9) printStringWithThousandsSeparator
20866
076ab5e1f702 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 20421
diff changeset
  2651
     ((99999999//10000) asFixedPoint:9) printStringWithThousandsSeparator
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2652
    "
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2653
!
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2654
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2655
printStringWithThousandsSeparator:thousandsSeparator
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2656
    "print the receiver as business number with a thousands separator to aStream.
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2657
     Notice:
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2658
	americans use comma
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2659
	germans (europeans ?) use a dot
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2660
	swiss people (business people ?) use a single quote
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2661
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2662
     Caveat: Should use the separator from the locale here"
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2663
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2664
    ^ String streamContents:[:s | self printOn:s thousandsSeparator:thousandsSeparator].
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2665
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2666
    "
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2667
     Transcript showCR:(1000000 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2668
     Transcript showCR:(12345678 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2669
     Transcript showCR:(1234567 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2670
     Transcript showCR:(123456 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2671
     Transcript showCR:(12345 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2672
     Transcript showCR:(1234 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2673
     Transcript showCR:(123 printStringWithThousandsSeparator:$').
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2674
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2675
     Transcript showCR:(1000000 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2676
     Transcript showCR:(12345678 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2677
     Transcript showCR:(1234567 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2678
     Transcript showCR:(123456 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2679
     Transcript showCR:(12345 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2680
     Transcript showCR:(1234 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2681
     Transcript showCR:(123 printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2682
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2683
     Transcript showCR:((1000000 asFixedPoint:2) printStringWithThousandsSeparator:$,).
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2684
     Transcript showCR:((12345678 asFixedPoint:2) printStringWithThousandsSeparator:$,).
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2685
     Transcript showCR:((1234567 asFixedPoint:2) printStringWithThousandsSeparator:$,).
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2686
     Transcript showCR:((123456 asFixedPoint:2) printStringWithThousandsSeparator:$,).
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2687
     Transcript showCR:((12345 asFixedPoint:2) printStringWithThousandsSeparator:$,).
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2688
     Transcript showCR:((1234 asFixedPoint:2) printStringWithThousandsSeparator:$,).
11097
5e4961639e41 printStringWithThousandsSep comments and refactored
Claus Gittinger <cg@exept.de>
parents: 11096
diff changeset
  2689
     Transcript showCR:((123 asFixedPoint:2) printStringWithThousandsSeparator:$,).
11096
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2690
    "
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2691
!
19d6c993e67f printStringWithThousandsSep moved up (also valid for FixedPoint Decimals)
Claus Gittinger <cg@exept.de>
parents: 11008
diff changeset
  2692
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2693
printfPrintString:formatString
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2694
    "Return a printed representation of the receiver as specified by formatString,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2695
     which is defined by printf."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2696
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2697
    ^ PrintfScanf printf:formatString argument:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2698
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2699
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2700
     2.0 asQDouble printfPrintString:'%10f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2701
     2.0 asQDouble printfPrintString:'%10.8f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2702
     2.0 printfPrintString:'%10.8f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2703
     12345 printfPrintString:'0x%06x' 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2704
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2705
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2706
    "Created: / 22-06-2017 / 13:55:22 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2707
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2708
18862
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2709
radixPrintStringRadix:radix
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2710
    "return a string representation of the receiver in the specified
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2711
     base; prepend XXr to the string"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2712
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2713
    ^ self printStringRadix:radix showRadix:true
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2714
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2715
    "
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2716
     31 radixPrintStringRadix:2
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2717
     31 radixPrintStringRadix:3
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2718
     31 radixPrintStringRadix:10
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2719
     31 radixPrintStringRadix:16
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2720
     31 radixPrintStringRadix:36
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2721
    "
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2722
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2723
    "Created: / 19-01-1998 / 17:38:00 / stefan"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2724
    "Modified: / 20-01-1998 / 14:11:03 / stefan"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2725
    "Modified: / 23-09-2011 / 14:00:02 / cg"
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2726
!
e0c777c9996f #REFACTORING
Claus Gittinger <cg@exept.de>
parents: 18850
diff changeset
  2727
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2728
storeOn:aStream
11460
146fb82b5523 comment
Claus Gittinger <cg@exept.de>
parents: 11458
diff changeset
  2729
    "append a string for storing the receiver onto the argument, aStream
146fb82b5523 comment
Claus Gittinger <cg@exept.de>
parents: 11458
diff changeset
  2730
     - since numbers are literals,they store as they print."
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2731
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2732
    ^ self printOn:aStream
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2733
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2734
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2735
storeString
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2736
    "return a string for storing
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2737
     - since numbers are literals, they store as they print."
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2738
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2739
    ^ self printString
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2740
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  2741
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2742
!Number methodsFor:'taylor series'!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2743
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2744
arcSin_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2745
    "compute the arcSine of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2746
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2747
    "/ uses taylor series:
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2748
    "/                 1*x^3   1*3 * x^5
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2749
    "/    arcSin = x + ----- + ---------- + ...
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2750
    "/                 2* 3    2*4 *  5
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2751
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2752
    |x2 num numf den denf approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2753
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2754
    ((self < -1) or:[self > 1]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2755
        ^ self class
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2756
            raise:#domainErrorSignal
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2757
            receiver:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2758
            selector:#arcSin
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2759
            arguments:#()
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2760
            errorString:'bad receiver in arcSin'
8844
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  2761
    ].
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  2762
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2763
    x2 := self squared.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2764
    num := x2 * self.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2765
    approx := self + (num / 6).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2766
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2767
    numf := 3.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2768
    denf := 4.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2769
    den := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2770
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2771
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2772
        num := (num * x2) * numf.   numf := numf + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2773
        den := den * denf.          denf := denf + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2774
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2775
        delta := num / (den * numf).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2776
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2777
    ] doUntil:[delta abs <= epsilon].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2778
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2779
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2780
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2781
     0.5 arcSin                                    0.523599
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2782
     0.5q arcSin                        0.523598776
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2783
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2784
     0.5q arcSin_withAccuracy:1         0.520833333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2785
     0.5q arcSin_withAccuracy:0.1       0.520833333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2786
     0.5q arcSin_withAccuracy:0.01      0.523177083
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2787
     0.5q arcSin_withAccuracy:0.001     0.523525856
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2788
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2789
     0.5q arcSin_withAccuracy:1e-20     0.523598776
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2790
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2791
     0.5 asLargeFloat arcSin_withAccuracy:1e-30    -- not yet
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2792
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2793
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2794
     0.1 arcSin                                    0.100167
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2795
     0.1q arcSin                        0.100167421
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2796
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2797
     0.1q arcSin_withAccuracy:1         0.100166667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2798
     0.1q arcSin_withAccuracy:0.1       0.100166667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2799
     0.1q arcSin_withAccuracy:0.01      0.100166667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2800
     0.1q arcSin_withAccuracy:0.001     0.100166667
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2801
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2802
     0.1q arcSin_withAccuracy:1e-20     0.100167421
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2803
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2804
     0.1 asLargeFloat arcSin_withAccuracy:1e-30    -- not yet
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2805
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2806
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2807
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2808
arcTan_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2809
    "compute the arcTangent of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2810
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2811
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2812
    "/                 x^3   x^5   x^7
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2813
    "/ arcTan(x) = x - --- + --- - --- ...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2814
    "/                  3     5    7
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2815
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2816
    |x2 num den approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2817
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2818
    x2 := self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2819
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2820
    num := (x2 * self) negated.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2821
    den := 3.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2822
    approx := self + (num / den).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2823
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2824
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2825
        den := den + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2826
        num := (num * x2) negated.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2827
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2828
        delta := num / den.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2829
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2830
    ] doUntil:[delta abs <= epsilon].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2831
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2832
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2833
    "
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2834
     1.0 arcTan                       0.785398
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2835
     1q arcTan                        0.785398163
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2836
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2837
     1q arcTan_withAccuracy:1         0.666666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2838
     1q arcTan_withAccuracy:0.1       0.744011544
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2839
     1q arcTan_withAccuracy:0.01      0.790299653
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2840
     1q arcTan_withAccuracy:0.001     0.785897165
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2841
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2842
     1q arcTan_withAccuracy:1e-8      0.785398168
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2843
     1q arcTan_withAccuracy:1e-20     -- not yet, converges very slow
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2844
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2845
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2846
     0.5 arcTan                         0.463648
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2847
     0.5q arcTan                        0.463647609
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2848
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2849
     0.5q arcTan_withAccuracy:1         0.458333333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2850
     0.5q arcTan_withAccuracy:0.1       0.458333333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2851
     0.5q arcTan_withAccuracy:0.01      0.464583333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2852
     0.5q arcTan_withAccuracy:0.001     0.463684276
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2853
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2854
     0.5q arcTan_withAccuracy:1e-20     0.463647609
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2855
     0.5 asLargeFloat arcTan_withAccuracy:1e-30    -- not yet
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2856
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2857
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2858
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2859
cbrt_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2860
    "compute cubic root of the receiver using a newton approx."
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2861
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2862
    "Use Newton's method (not taylor):
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2863
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2864
                 2*x_n + (a / x_n^2)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2865
        x_n+1 =  ---------------
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2866
                      3
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2867
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2868
        cbrt(a) = x_n
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2869
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2870
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2871
    |approx|
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2872
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2873
    self = 0 ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2874
        ^ self
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2875
    ].
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2876
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2877
    approx := 1.
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2878
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2879
        |lastApprox|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2880
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2881
        lastApprox := approx.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2882
        approx := ((approx * 2) + (self / approx / approx)) / 3.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2883
        (approx - lastApprox) abs > epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2884
    ] whileTrue.
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2885
    ^ approx
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2886
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2887
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2888
     8q cbrt                                         2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2889
     8q cbrt_withAccuracy:0.01                       2.000004911675504018
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2890
     8q cbrt_withAccuracy:0.0001                     2.000000000012062239
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2891
     8q cbrt_withAccuracy:0.0000001                  2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2892
     8q cbrt_withAccuracy:0.0000000001               2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2893
     8q cbrt_withAccuracy:0.000000000001             2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2894
     8q cbrt_withAccuracy:LongFloat epsilon          2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2895
     8q asQDouble cbrt_withAccuracy:QDouble epsilon  2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2896
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2897
     27q cbrt_withAccuracy:0.01                      3.000000541064176501
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2898
     27q cbrt_withAccuracy:LongFloat epsilon         3.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2899
     -27q cbrt_withAccuracy:LongFloat epsilon        -3.0
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2900
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2901
     MessageTally spyOn:[ |arg|
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2902
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2903
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2904
             arg cbrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2905
        ]
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2906
     ]
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2907
     Time millisecondsToRun:[ |arg|
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2908
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2909
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2910
             arg cbrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2911
        ]
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2912
     ]
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2913
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2914
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2915
    "Modified (comment): / 25-07-2017 / 16:09:22 / cg"
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2916
!
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2917
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2918
cos_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2919
    "compute the cosine of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2920
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2921
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2922
    "/               x^2   x^4   x^6
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2923
    "/  cos(x) = 1 - --- + --- - --- ...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2924
    "/                2!!    4!!    6!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2925
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2926
    |x2 facN num den approx lastApprox|
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2927
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2928
    x2 := self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2929
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2930
    num := x2 negated.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2931
    den := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2932
    facN := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2933
    approx := 1 + (num / den).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2934
    lastApprox := 1.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2935
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2936
    [ (lastApprox - approx) abs > epsilon ] whileTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2937
        facN := facN + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2938
        den := den * (facN - 1) * facN.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2939
        num := (num * x2) negated.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2940
        lastApprox := approx.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2941
        approx := approx + (num / den).
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2942
    ].
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2943
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2944
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2945
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2946
     1.0 cos                                    0.540302
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2947
     1.0 asLongFloat cos                        0.5403023058681397174
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2948
     1.0 asLongFloat cos_withAccuracy:1         0.5
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2949
     1.0 asLongFloat cos_withAccuracy:0.1       0.541666667
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2950
     1.0 asLongFloat cos_withAccuracy:0.01      0.540277778
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2951
     1.0 asLongFloat cos_withAccuracy:0.001     0.540302579
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2952
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2953
     1.0 asLongFloat cos_withAccuracy:1e-40     0.5403023058681397175
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2954
     1.0 asQDouble cos                          0.5403023058681396874081335957994
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2955
     1.0 asQDouble cos_withAccuracy:1e-40       
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2956
     Wolfram:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2957
            0.5403023058681396874081335957994 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2958
            0.540302305868139717400936607442976603732310420617922227670...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2959
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2960
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2961
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2962
cosh_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  2963
    "compute the hyperbolic cosine of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2964
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2965
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2966
    "/               x^2   x^4   x^6
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2967
    "/    cosh = x + --- + --- + --- ...
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2968
    "/                2!!    4!!    6!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2969
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2970
    |x2 facN num den approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2971
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2972
    x2 := self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2973
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2974
    num := x2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2975
    den := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2976
    facN := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2977
    approx := self + (num / den).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2978
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2979
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2980
        facN := facN + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2981
        den := den * (facN - 1) * facN.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2982
        num := num * x2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2983
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2984
        delta := num / den.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2985
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  2986
    ] doUntil:[delta <= epsilon].
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2987
    ^ approx + self.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2988
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2989
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2990
     1.0 cosh                                    1.54308
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2991
     1.0q cosh_withAccuracy:1         1.5
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2992
     1.0q cosh_withAccuracy:0.1       1.54308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2993
     1.0q cosh_withAccuracy:0.01      1.54308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2994
     1.0q cosh_withAccuracy:0.001     1.54308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2995
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  2996
     1.0q cosh_withAccuracy:1e-40   -> 1.543080
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  2997
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2998
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  2999
    "Modified: / 01-08-2017 / 14:54:40 / stefan"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3000
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3001
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3002
epsilon
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3003
    "return the maximum relative spacing of instances of mySelf
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3004
     (i.e. the value-delta of the least significant bit)"
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3005
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3006
    ^ self class epsilon
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3007
!
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3008
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3009
exp_withAccuracy:epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3010
    "compute e^x of the receiver using a taylor series approximation.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3011
     This method is only invoked for limitedPrecisionReal classes, which do not compute
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3012
     exp themself (i.e. QDouble)"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3013
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3014
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3015
    "/             x    x^2   x^3
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3016
    "/  e^x = 1 + --- + --- + --- ...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3017
    "/             1!!    2!!    3!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3018
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3019
    |x2 facN num den approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3020
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3021
    x2 := self squared. "/ self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3022
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3023
    num := x2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3024
    den := 2.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3025
    facN := 2.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3026
    approx := self + 1 + (num / den).
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3027
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3028
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3029
        facN := facN + 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3030
        den := den * facN.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3031
        num := num * self.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3032
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3033
        delta := num / den.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3034
"/ delta mantissa == 0 ifTrue:[self halt. num / den].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3035
"/ Transcript showCR:delta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3036
        delta isNaN ifTrue:[self halt:'nan when dividing for delta'. num / den].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3037
        delta = 0 ifTrue:[self halt:'zero delta'].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3038
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3039
    ] doUntil:[delta abs <= epsilon].
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3040
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3041
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3042
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3043
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3044
     wolfram:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3045
                7.389056098930650227230427460575007813180315570551847324087
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3046
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3047
     (2 asLargeFloat exp_withAccuracy:1e-100) printfPrintString:'%50.48f'                      
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3048
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3049
     1.0 exp                                    2.71828
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3050
     1q exp                                     2.71828183
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3051
     2q exp                                     7.3890561
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3052
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3053
     1q exp_withAccuracy:1                      2.66666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3054
     1q exp_withAccuracy:0.1                    2.70833333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3055
     1q exp_withAccuracy:0.01                   2.71666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3056
     1q exp_withAccuracy:0.001                  2.71825397
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3057
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3058
     -1 exp                                     0.367879441171442
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3059
     -1q exp_withAccuracy:(1e-60)               0.3678794411714423216
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3060
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3061
     2q exp_withAccuracy:LongFloat epsilon      7.3890561
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3062
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3063
     42 asQDouble exp_withAccuracy:QDouble epsilon        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3064
     42 asQDouble exp_withAccuracy:LongFloat epsilon  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3065
     42 asQDouble exp_withAccuracy:Float epsilon    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3066
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3067
     2 asQDouble exp_withAccuracy:QDouble epsilon   7.38905609893065022723     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3068
     2 asQDouble exp_withAccuracy:LongFloat epsilon 7.38905609893065022723  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3069
     2 asQDouble exp_withAccuracy:Float epsilon     7.38905609893065022489
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3070
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3071
     1 asQDouble exp_withAccuracy:QDouble epsilon   2.71828182845904523536     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3072
     1 asQDouble exp_withAccuracy:LongFloat epsilon 2.71828182845904523536 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3073
     1 asQDouble exp_withAccuracy:Float epsilon     2.71828182845904522671
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3074
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3075
     1.0 asLongFloat exp_withAccuracy:1e-40     2.71828183
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3076
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3077
     5 exp_withAccuracy:1e-40
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3078
     (1 exp_withAccuracy:1e-100) asFixedPoint:100
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3079
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3080
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3081
    "Modified: / 10-10-2017 / 16:04:08 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3082
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3083
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3084
ln_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3085
    "compute ln of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3086
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3087
    "uses taylor series:
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3088
                 u^2   u^3
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3089
        ln = u - --- + --- ...
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3090
                  2    3
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3091
      where:
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3092
             u = x - 1    and: x < 1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3093
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3094
     Now we use modified taylor, which converges a little faster:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3095
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3096
                   1+y        1   1       1
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3097
        ln(x) = ln --- = 2y ( - + - y^2 + - y^4 + ....)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3098
                   1-y        1   3       5
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3099
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3100
        where y = (x-1) / (x+1)  and x > 0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3101
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3102
     Warning: this converges very slowly. Find a better algorithm    
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3103
    "
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3104
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3105
    |denominator approx y y2 exp delta count|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3106
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3107
    self <= 0 ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3108
        ^ self class
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3109
            raise:(self = 0 ifTrue:[#infiniteResultSignal] ifFalse:[#domainErrorSignal])
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3110
            receiver:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3111
            selector:#ln
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3112
            arguments:#()
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3113
            errorString:'bad receiver in ln (not strictly positive)'
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3114
    ].
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3115
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3116
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3117
    y := (self - 1)/(self + 1).
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3118
    exp := y2 := y squared.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3119
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3120
    approx := 1.0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3121
    denominator := 3.0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3122
    count := 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3123
    
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3124
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3125
        delta := exp / denominator.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3126
        approx := approx + delta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3127
        exp := exp * y2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3128
        denominator := denominator + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3129
        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3130
        count := count + 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3131
        (count \\ 100) == 0 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3132
            Logger warning:'slow ln-taylor converging...'.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3133
        ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3134
    ] doUntil:[delta <= epsilon or:[count > 10000]].
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3135
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3136
    ^ y * 2 * approx.
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3137
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3138
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3139
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3140
     2.0 ln                         0.693147180559945
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3141
     2.0q ln                        0.6931471805599453094
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3142
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3143
     2.0q ln_withAccuracy:1                  0.691358025
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3144
     2.0q ln_withAccuracy:0.1                0.691358025
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3145
     2.0q ln_withAccuracy:0.01               0.693004115
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3146
     2.0q ln_withAccuracy:0.0000001          0.69314718
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3147
     2.0q ln_withAccuracy:1e-10              0.6931471805589163927
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3148
     2.0q ln_withAccuracy:1e-20              0.6931471805599453094
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3149
     2.0q ln_withAccuracy:1e-40              0.6931471805599453094
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3150
     2.0q ln_withAccuracy:2.0q class epsilon 0.6931471805599453094
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3151
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3152
     (2 ln_withAccuracy:1e-40) -> a fraction        
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3153
     0 ln_withAccuracy:1e-40
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3154
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3155
     (2 ln_withAccuracy:1e-100) asFixedPoint:100
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3156
     (2 asFixedPoint:200) ln_withAccuracy:(1/(10 raisedTo:200))
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3157
        0.69314718055994530941723212145817656807550013436025525412068000949339362196969471560586332699641868754200148102057068573368552023575813055703267075163507596193072757082837143519030703862389167347112335
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3158
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3159
     (2 asFixedPoint:400) ln_withAccuracy:(1/(10 raisedTo:400))
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3160
        0.69314718055994530941723212145817656807550013436025525412068000949339362196969471560586332699641868754200148102057068573368552023575813055703267075163507596193072757082837143519030703862389167347112335 01153644979552391204751726815749320651555247341395258829504530070953263666426541042391578149520437404303855008019441706416715186447128399681717845469570262716310645461502572074024816377733896385506953
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3161
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3162
     (2.0 asQDouble ln_withAccuracy:QDouble epsilon) printfPrintString:'%60.58f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3163
        0.69314718055994 52709398341558750792990469129794959648865081'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3164
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3165
     Wolfram says:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3166
        0.69314718055994530941723212145817656807550013436025525412068000949339362196969471560586332699641868754200148102057068573368552023575813055703267075163507596193072757082837143519030703862389167347112335 01153644979552391204751726...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3167
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3168
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3169
    "Modified: / 05-07-2017 / 17:16:24 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3170
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3171
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3172
nthRoot:n withAccuracy:epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3173
    "compute nth root of the receiver using a newton approx."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3174
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3175
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3176
      Use Newton's method:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3177
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3178
                 (n-1)*x_n^n + (a / x_n^(n-1))
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3179
        x_n+1 =  -----------------------------
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3180
                             n
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3181
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3182
        rt(n, a) = x_n
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3183
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3184
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3185
    |approx delta absDelta prevDelta|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3186
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3187
    self = 0 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3188
        ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3189
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3190
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3191
    "/ the demanded epsilon may NEVER be smaller than the real representation's epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3192
    self assert:(epsilon >= (self class epsilon)).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3193
    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3194
    approx := (self / 2).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3195
    delta := ((self / (approx raisedToInteger:(n-1))) - approx) / n.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3196
    absDelta := delta abs.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3197
    approx := approx + delta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3198
    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3199
    [
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3200
        prevDelta := absDelta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3201
        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3202
        delta := ((self / (approx raisedToInteger:(n-1))) - approx) / n.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3203
        absDelta := delta abs.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3204
        approx := approx + delta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3205
        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3206
        (absDelta < prevDelta) ifFalse:[ 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3207
            DomainError raiseRequestErrorString:'no convergence in Newton approx.'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3208
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3209
        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3210
        (absDelta > epsilon)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3211
    ] whileTrue.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3212
    ^ approx
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3213
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3214
    "                                             
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3215
     8q nthRoot:3 withAccuracy:0.01               2.00000002488636242
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3216
     8q nthRoot:3 withAccuracy:0.0001             2.00000000000000031
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3217
     8q nthRoot:3 withAccuracy:0.0000001          2.00000000000000031
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3218
     8q nthRoot:3 withAccuracy:0.0000000001       2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3219
     8q nthRoot:3 withAccuracy:0.000000000001     2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3220
     8q nthRoot:3 withAccuracy:LongFloat epsilon  2.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3221
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3222
     27q nthRoot:3 withAccuracy:0.01                3.000000081210202031
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3223
     27q nthRoot:3 withAccuracy:LongFloat epsilon   3.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3224
     -27q nthRoot:3 withAccuracy:LongFloat epsilon  -3.0
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3225
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3226
     10000q nthRoot:5 withAccuracy:1e-18        -> 6.309573444801932495 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3227
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3228
     (10000 asQDouble nthRoot:5) printfPrintString:'%70.68f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3229
               6.30957344480193249434360136622343864672945257188228724527729528834741'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3230
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3231
     actual result (Mathematica):        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3232
               6.309573444801932494343601366223438646729452571882287245277...
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3233
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3234
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3235
    "Created: / 22-06-2017 / 15:51:55 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3236
    "Modified: / 22-09-2017 / 10:14:59 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3237
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3238
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3239
sin_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3240
    "compute the sine of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3241
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3242
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3243
    "/               x^3   x^5   x^7
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3244
    "/  sin(x) = x - --- + --- - --- ...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3245
    "/                3!!    5!!    7!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3246
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3247
    |x2 facN num den approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3248
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3249
    x2 := self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3250
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3251
    num := (x2 * self) negated.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3252
    den := 2*3.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3253
    facN := 3.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3254
    approx := self + (num / den).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3255
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3256
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3257
        facN := facN + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3258
        den := den * (facN - 1) * facN.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3259
        num := (num * x2) negated.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3260
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3261
        delta := num / den.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3262
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3263
    ] doUntil:[delta abs <= epsilon].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3264
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3265
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3266
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3267
     1.0 sin                                    0.841471
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3268
     1.0q sin                        0.841470985
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3269
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3270
     1.0q sin_withAccuracy:1         0.833333333
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3271
     1.0q sin_withAccuracy:0.1       0.841666667
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3272
     1.0q sin_withAccuracy:0.01      0.841666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3273
     1.0q sin_withAccuracy:0.001     0.841468254
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3274
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3275
     1.0q sin_withAccuracy:1e-40     0.841470985
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3276
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3277
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3278
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3279
sinh_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3280
    "compute the hyperbolic sine of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3281
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3282
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3283
    "/               x^3   x^5   x^7
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3284
    "/ sinh(x) = x + --- + --- + --- ...
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3285
    "/                3!!    5!!    7!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3286
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3287
    |x2 facN num den approx delta|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3288
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3289
    x2 := self squared.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3290
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3291
    num := x2 * self.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3292
    den := 2*3.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3293
    facN := 3.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3294
    approx := self + (num / den).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3295
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3296
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3297
        facN := facN + 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3298
        den := den * (facN - 1) * facN.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3299
        num := num * x2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3300
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3301
        delta := num / den.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3302
        approx := approx + delta.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3303
    ] doUntil:[delta abs <= epsilon].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3304
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3305
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3306
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3307
     1.0 sinh                                    1.1752
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3308
     1q sinh                        1.17520119
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3309
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3310
     1q sinh_withAccuracy:1         1.16666667
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3311
     1q sinh_withAccuracy:0.1       1.175
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3312
     1q sinh_withAccuracy:0.01      1.175
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3313
     1q sinh_withAccuracy:0.001     1.17519841
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3314
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3315
     1q sinh_withAccuracy:1e-40     1.17520119
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3316
    "
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3317
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3318
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3319
sqrt_withAccuracy:epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3320
    "compute square root of the receiver using newton-raphson/heron algorithm"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3321
    "Use the Heron algorithm (not Taylor)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3322
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3323
    |guess|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3324
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3325
    false "self isInteger" ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3326
        guess := 1 bitShift:(self highBit // 2)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3327
    ] ifFalse:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3328
        guess := self / 2.0.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3329
    ].    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3330
    ^ self sqrt_withAccuracy:epsilon fromInitialGuess:guess
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3331
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3332
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3333
     2 sqrt                                  1.4142135623731      - computed by CPU/FPU
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3334
     200000000 sqrt                          
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3335
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3336
     2q sqrt                                 1.414213562373095049 - computed by CPU/FPU
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3337
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3338
     2q sqrt_withAccuracy:0.01               1.414215686274509804 - computed by Smalltalk
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3339
     2q sqrt_withAccuracy:0.0001             1.414213562374689911
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3340
     2q sqrt_withAccuracy:0.0000001          1.414213562373095049
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3341
     2q sqrt_withAccuracy:0.0000000001       1.414213562373095049
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3342
     2q sqrt_withAccuracy:0.000000000001     1.414213562373095049
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3343
     
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3344
     2q sqrt_withAccuracy:LongFloat epsilon  1.414213562373095049
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3345
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3346
     (4 sqrt_withAccuracy:Integer epsilon) asFloat
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3347
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3348
     MessageTally spyOn:[ |arg|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3349
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3350
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3351
             arg sqrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3352
        ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3353
     ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3354
     Time millisecondsToRun:[ |arg|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3355
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3356
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3357
             arg sqrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3358
        ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3359
     ]
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3360
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3361
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3362
    "Modified: / 25-07-2017 / 17:44:46 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3363
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3364
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3365
sqrt_withAccuracy:epsilon fromInitialGuess:guess
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3366
    "compute square root of the receiver using newton-raphson/heron algorithm"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3367
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3368
    "Use the Heron algorithm (not Taylor):
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3369
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3370
                 x_n + (a / x_n)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3371
        x_n+1 =  ---------------
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3372
                      2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3373
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3374
        sqrt(a) = x_n
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3375
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3376
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3377
    |approx lastApprox|
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3378
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3379
    self <= 0 ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3380
        self = 0 ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3381
            ^ self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3382
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3383
        ^ self class
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3384
            raise:#imaginaryResultSignal
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3385
            receiver:self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3386
            selector:#sqrt
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3387
            arguments:#()
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3388
            errorString:'bad (negative) receiver in sqrt'
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3389
    ].
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3390
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3391
    approx := guess.
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3392
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3393
        lastApprox := approx.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3394
        approx := ((self / approx) + approx) / 2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3395
        (approx - lastApprox) abs > epsilon
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3396
    ] whileTrue.
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3397
    ^ approx
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3398
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3399
    "
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3400
     2 sqrt                                  1.4142135623731
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3401
     2q sqrt                                 1.414213562373095049
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3402
     2q sqrt_withAccuracy:0.01               1.414215686274509804
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3403
     2q sqrt_withAccuracy:0.0001             1.414213562374689911
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3404
     2q sqrt_withAccuracy:0.0000001          1.414213562373095049
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3405
     2q sqrt_withAccuracy:0.0000000001       1.414213562373095049
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3406
     2q sqrt_withAccuracy:0.000000000001     1.414213562373095049
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3407
     2q sqrt_withAccuracy:LongFloat epsilon  1.414213562373095049
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3408
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3409
     (2 asQDouble sqrt_withAccuracy:LongFloat epsilon) printfPrintString:'%70.68f'
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3410
            1.41421356237309504880168872420969807856967187537723400156101313309966
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3411
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3412
     (4 sqrt_withAccuracy:Integer epsilon) asFloat
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3413
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3414
     MessageTally spyOn:[ |arg|
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3415
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3416
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3417
             arg sqrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3418
        ]
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3419
     ]
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3420
     Time millisecondsToRun:[ |arg|
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3421
        arg := 2 asLongFloat.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3422
        1000000 timesRepeat:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3423
             arg sqrt_withAccuracy:0.000000000001
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3424
        ]
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3425
     ]
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3426
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3427
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3428
    "Created: / 22-06-2017 / 13:59:48 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3429
    "Modified (comment): / 25-07-2017 / 16:07:37 / cg"
7729
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3430
!
bbd20db09d1b Fix senders of #xxxx_withAccuracy: to use #epsilon instead of #precision.
Stefan Vogel <sv@exept.de>
parents: 7468
diff changeset
  3431
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3432
tan_withAccuracy:epsilon
17190
284d9c71385f class: Number
Claus Gittinger <cg@exept.de>
parents: 17127
diff changeset
  3433
    "compute the tangens of the receiver using a taylor series approx."
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3434
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3435
    "/ uses taylor series:
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3436
    "/                x^3     x^5      x^7      x^9     2^2n * ( 2^2n - 1) * B2n * x^(2n-1)
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3437
    "/    tan = x + 1*--- + 2*--- + 17*--- + 62*----... ----------------------------------...
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3438
    "/                 3       15      315      2835                 (2n)!!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3439
    "/ where Bi is the ith bernoulli number.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3440
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3441
    |factors idx x2 num t approx lastApprox delta nFactors|
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3442
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3443
    "/    (1 to:20) collect:[:n| |num den|
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3444
    "/        num := (2 raisedTo:(2*n)) * ((2 raisedTo:(2*n))-1) * ((n*2) bernoulli).
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3445
    "/        den := (2*n) factorial.
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3446
    "/        num / den
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3447
    "/    ]
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3448
   factors := #(
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3449
        (1 3)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3450
        (2 15)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3451
        (17 315)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3452
        (62 2835)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3453
        (1382 155925)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3454
        (21844 6081075)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3455
        (929569 638512875)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3456
        (6404582 10854718875)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3457
        (443861162 1856156927625)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3458
        (18888466084 194896477400625)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3459
        (113927491862 2900518163668125)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3460
        (58870668456604 3698160658676859375)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3461
        (8374643517010684 1298054391195577640625)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3462
        (689005380505609448 263505041412702261046875)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3463
        (129848163681107301953 122529844256906551386796875)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3464
        (1736640792209901647222 4043484860477916195764296875)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3465
        (418781231495293038913922 2405873491984360136479756640625)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3466
        (56518638202982204522669764 801155872830791925447758961328125)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3467
        (32207686319158956594455462 1126482925555250126673224649609375)).
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3468
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3469
    nFactors := factors size.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3470
    x2 := self squared.
8203
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  3471
    num := x2 * self.               "/ =  x^3
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  3472
    approx := self + (num / 3).     "/ do the first iteration
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3473
    lastApprox := self.
8203
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  3474
    idx := 2.
666bfa7bcb97 Fix C cmpiler warnings.
Stefan Vogel <sv@exept.de>
parents: 7857
diff changeset
  3475
    [
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3476
        idx > nFactors ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3477
            ArithmeticError raiseErrorString:'too many iterations'.
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3478
"/ Not enough bernoulli numbers for now...
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3479
"/            |tempNum tempDen|
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3480
"/            tempNum := 2 raisedTo:(2*idx).
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3481
"/            tempNum := tempNum * (tempNum-1) * ((2*idx) bernoulli).
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3482
"/            tempDen := (2*idx) factorial.
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3483
"/            t := Array with:tempNum with:tempDen.
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3484
        ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3485
        t := factors at:idx.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3486
        idx := idx + 1.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3487
        num := num * x2.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3488
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3489
        delta := num * t first / t second.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3490
        approx := approx + delta.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3491
        delta abs > epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3492
    ] whileTrue.
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3493
    ^ approx
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3494
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3495
    "
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3496
     0.5 tan                         0.546302
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3497
     0.5q tan                        0.54630249
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3498
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3499
     0.5q tan_withAccuracy:1         0.541666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3500
     0.5q tan_withAccuracy:0.1       0.541666667
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3501
     0.5q tan_withAccuracy:0.01      0.545833333
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3502
     0.5q tan_withAccuracy:0.001     0.54625496
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3503
     0.5q tan_withAccuracy:1e-15     0.54630249
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3504
10556
fb4ea1df1f1d Fix/speed up taylor computations
Stefan Vogel <sv@exept.de>
parents: 10550
diff changeset
  3505
     0.5q tan_withAccuracy:1e-40     -- too many iterations
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3506
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3507
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3508
    "Modified: / 15-02-2018 / 18:53:37 / stefan"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3509
! !
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3510
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3511
!Number methodsFor:'testing'!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3512
17224
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3513
even
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3514
    "return true if the receiver is divisible by 2."
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3515
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3516
    self fractionPart = 0 ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3517
        ^ (self / 2) fractionPart = 0
17224
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3518
    ].
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3519
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3520
    "this will raise an error"
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3521
    ^ super even
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3522
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3523
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3524
     2 even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3525
     2.0 even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3526
     3.0 even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3527
     2.4 even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3528
     (5/3) even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3529
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3530
     2 asFraction even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3531
     (2 asFixedPoint:5) even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3532
     2 asFloatE even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3533
     2 asFloatD even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3534
     2 asFloatQ even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3535
     2 asFloatQD even
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3536
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3537
     (2.1 asFloatQD - (QDouble readFrom:'2.1')) fractionPart
17224
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3538
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3539
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3540
    "Modified (comment): / 03-07-2017 / 14:14:46 / cg"
17224
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3541
!
43a8ca39cc90 class: Number
Stefan Vogel <sv@exept.de>
parents: 17207
diff changeset
  3542
5360
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3543
isDivisibleBy:aNumber
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3544
    "return true, if the receiver can be divided by the argument, aNumber without a remainder.
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3545
     Notice, that the result is only worth trusting, if the receiver is an integer."
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3546
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3547
    aNumber = 0 ifTrue: [^ false].
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3548
    aNumber isInteger ifFalse: [^ false].
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3549
    ^ (self \\ aNumber) = 0
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3550
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3551
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3552
     3 isDivisibleBy:2
5360
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3553
     4 isDivisibleBy:2
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3554
     4.0 isDivisibleBy:2
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3555
     4.5 isDivisibleBy:4.5
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3556
     4.5 isDivisibleBy:1.0
5360
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3557
    "
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3558
!
1aef297d3cbe added #isDivisibleBy:
Claus Gittinger <cg@exept.de>
parents: 5322
diff changeset
  3559
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  3560
isNaN
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3561
    "return true, if the receiver is an invalid number (NaN - not a number)."
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  3562
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  3563
    ^ false
6155
00eaf2fa55bc isReal comment
Claus Gittinger <cg@exept.de>
parents: 6154
diff changeset
  3564
00eaf2fa55bc isReal comment
Claus Gittinger <cg@exept.de>
parents: 6154
diff changeset
  3565
    "Created: / 5.11.2001 / 18:07:26 / cg"
6143
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  3566
!
695cc93a96b4 isNan, isInfinite and closeTo:
james
parents: 6087
diff changeset
  3567
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3568
isNumber
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3569
    "return true, if the receiver is a kind of number"
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3570
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3571
    ^ true
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3572
!
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3573
19136
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3574
isPerfectSquare
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3575
    "return true if I am a perfect square.
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3576
     That is a number for which the square root is an integer."
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3577
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3578
    self truncated = self ifFalse:[^ false].
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3579
    ^ self asInteger isPerfectSquare
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3580
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3581
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3582
     0 isPerfectSquare   
19136
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3583
     0.0 isPerfectSquare
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3584
     1 isPerfectSquare  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3585
     1.0 isPerfectSquare 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3586
     2 isPerfectSquare  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3587
     2.0 isPerfectSquare 
19136
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3588
     3 isPerfectSquare
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3589
     3.0 isPerfectSquare
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3590
     4 isPerfectSquare
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3591
     4.0 isPerfectSquare
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3592
     9 isPerfectSquare   
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3593
     9.0 isPerfectSquare  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3594
     123456789012345678901234567890 squared isPerfectSquare
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3595
     1000 factorial squared isPerfectSquare  
19136
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3596
    "
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3597
!
5645cf0c4774 #FEATURE
Claus Gittinger <cg@exept.de>
parents: 19092
diff changeset
  3598
6087
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3599
isReal
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3600
    "return true, if the receiver is some kind of real number (as opposed to a complex);
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3601
     true is returned here - the method is redefined from Object."
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3602
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3603
    ^ true
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3604
!
826b87eab740 moved isReal
Claus Gittinger <cg@exept.de>
parents: 6072
diff changeset
  3605
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3606
isZero
1557
2c3c301cf48f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  3607
    "return true, if the receiver is zero"
2c3c301cf48f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  3608
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3609
    ^ self = 0
1557
2c3c301cf48f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  3610
2c3c301cf48f checkin from browser
Claus Gittinger <cg@exept.de>
parents: 1422
diff changeset
  3611
    "Modified: 18.7.1996 / 12:40:49 / cg"
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3612
! !
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  3613
4659
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3614
!Number methodsFor:'tracing'!
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3615
4682
4158042a9c8c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4659
diff changeset
  3616
traceInto:aRequestor level:level from:referrer
4659
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3617
    "double dispatch into tracer, passing my type implicitely in the selector"
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3618
4682
4158042a9c8c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 4659
diff changeset
  3619
    ^ aRequestor traceNumber:self level:level from:referrer
4659
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3620
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3621
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3622
! !
cdf37afc0e26 moved isLiteral - some numbers are not.
Claus Gittinger <cg@exept.de>
parents: 4637
diff changeset
  3623
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3624
!Number methodsFor:'trigonometric'!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3625
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3626
arcCos
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3627
    "return the arccosine of the receiver (in radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3628
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3629
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3630
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3631
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3632
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3633
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3634
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3635
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3636
            ^ f arcCos.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3637
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3638
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3639
    "/ slow fallback
8844
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3640
    ^ (self class pi / 2) - self arcSin
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3641
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3642
    "Modified: / 05-07-2017 / 17:24:32 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3643
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3644
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3645
arcCosech
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3646
    "return the inverse hyperbolic cosecant of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3647
    "caveat: misnomer; should be called aCosech or arCosech"
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3648
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3649
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3650
    "/ retry after converting to float
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3651
    (self isLimitedPrecisionReal not
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3652
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3653
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3654
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3655
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3656
            ^ f arcCosech.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3657
        ].
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3658
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3659
    "/ slow fallback
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3660
    ^ ((1 + ((self squared)+1) sqrt) / self) ln
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3661
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3662
    "Modified: / 05-07-2017 / 17:24:56 / cg"
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3663
!
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3664
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3665
arcCosh
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3666
    "return the inverse hyperbolic cosine of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3667
    "caveat: misnomer; should be called aCosh or arCosh"
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3668
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3669
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3670
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3671
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3672
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3673
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3674
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3675
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3676
            ^ f arcCosh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3677
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3678
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3679
    "/ slow fallback
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3680
    ^ (self + (self squared-1) sqrt) ln.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3681
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3682
    "Modified: / 05-07-2017 / 17:25:03 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3683
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3684
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3685
arcCoth
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3686
    "return the inverse hyperbolic cotangent of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3687
    "caveat: misnomer; should be called aCoth or arCoth"
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3688
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3689
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3690
    "/ retry after converting to float
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3691
    (self isLimitedPrecisionReal not
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3692
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3693
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3694
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3695
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3696
            ^ f arcCoth.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3697
        ].
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3698
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3699
    "/ slow fallback
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3700
    ^ ((self+1) / (self-1)) ln / 2
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3701
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3702
    "Modified: / 05-07-2017 / 17:25:14 / cg"
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3703
!
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3704
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3705
arcSech
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3706
    "return the inverse hyperbolic secant of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3707
    "caveat: misnomer; should be called aSech or arSech"
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3708
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3709
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3710
    "/ retry after converting to float
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3711
    (self isLimitedPrecisionReal not
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3712
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3713
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3714
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3715
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3716
            ^ f arcSech.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3717
        ].
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3718
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3719
    "/ slow fallback
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3720
    ^ ((1 + (1-(self squared)) sqrt) / self) ln
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3721
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3722
    "Modified: / 05-07-2017 / 17:25:22 / cg"
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3723
!
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3724
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3725
arcSin
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3726
    "return the arcsine of the receiver (in radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3727
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3728
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3729
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3730
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3731
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3732
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3733
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3734
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3735
            ^ f arcSin.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3736
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3737
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3738
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3739
    ^ self arcSin_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3740
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3741
    "Modified: / 05-07-2017 / 17:25:30 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3742
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3743
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3744
arcSinh
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3745
    "return the inverse hyperbolic sine of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3746
    "caveat: misnomer; should be called aSinh or arSinh"
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3747
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3748
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3749
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3750
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3751
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3752
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3753
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3754
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3755
            ^ f arcSinh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3756
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3757
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3758
    "/ slow fallback
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3759
    ^ ( self + (self squared+1) sqrt ) ln
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3760
    "/    ^ self arcSinh_withAccuracy:self epsilon
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3761
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3762
    "Modified: / 05-07-2017 / 17:25:38 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3763
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3764
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3765
arcTan
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3766
    "return the arctangent of the receiver (as radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3767
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3768
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3769
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3770
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3771
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3772
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3773
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3774
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3775
            ^ f arcTan.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3776
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3777
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3778
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3779
    ^ self arcTan_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3780
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3781
    "Modified: / 05-07-2017 / 17:25:46 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3782
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3783
11488
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3784
arcTan2:x
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3785
    "return atan2(self,x) (as radians)"
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3786
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3787
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3788
    "/ retry after converting to float
11488
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3789
    (self isLimitedPrecisionReal not
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3790
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3791
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3792
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3793
        (f := self asFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3794
            ^ f arcTan2:x.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3795
        ].
11488
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3796
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3797
    "/ very slow fallback
11488
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3798
    ^ self arcTan2_withAccuracy:self epsilon x:x
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3799
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3800
    "Modified: / 05-07-2017 / 17:26:16 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3801
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3802
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3803
arcTan:denominator
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3804
    "Evaluate the four quadrant arc tangent of the argument denominator (x) and the receiver (y)."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3805
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3806
    |t|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3807
    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3808
    (self isZero) ifTrue: [
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3809
        (denominator strictlyPositive)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3810
            ifTrue: [ ^ 0 ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3811
            ifFalse: [ ^ self class pi ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3812
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3813
    (denominator isZero) ifTrue: [
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3814
        (self strictlyPositive)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3815
            ifTrue: [ ^ self class halfpi ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3816
            ifFalse: [ ^ self class halfpiNegative ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3817
    ].
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3818
    t := (self / denominator) arcTan.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3819
    (denominator strictlyPositive)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3820
        ifTrue: [ ^ t ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3821
        ifFalse: [ ^ t + self class pi ]
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3822
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3823
    "Created: / 07-06-2007 / 21:10:32 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3824
    "Modified: / 11-06-2007 / 12:58:34 / cg"
11488
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3825
!
8d948de20326 +arcTan2:
Claus Gittinger <cg@exept.de>
parents: 11460
diff changeset
  3826
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3827
arcTanh
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3828
    "return the inverse hyperbolic tangent of the receiver."
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3829
    "caveat: misnomer; should be called aTanh or arTanh"
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  3830
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3831
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3832
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3833
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3834
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3835
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3836
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3837
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3838
            ^ f arcTanh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3839
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3840
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3841
    "/ slow fallback
19768
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3842
    ^ ((1 + self) / (1 - self)) ln / 2
55e36a939e1e #FEATURE by cg
Claus Gittinger <cg@exept.de>
parents: 19702
diff changeset
  3843
    "/ s^ ((1 + self) ln / 2) - ((1 - self) ln / 2)
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3844
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3845
    "Modified: / 05-07-2017 / 17:26:27 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3846
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3847
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3848
cos
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3849
    "return the cosine of the receiver (interpreted as radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3850
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3851
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3852
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3853
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3854
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3855
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3856
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3857
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3858
            ^ f cos.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3859
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3860
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3861
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3862
    ^ self cos_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3863
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3864
    "Modified: / 05-07-2017 / 17:26:33 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3865
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3866
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3867
cosh
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3868
    "return the hyperbolic cosine of the receiver"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3869
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3870
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3871
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3872
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3873
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3874
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3875
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3876
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3877
            ^ f cosh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3878
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3879
    ].
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3880
    "/ very slow fallback
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3881
    ^ self cosh_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3882
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3883
    "Modified: / 05-07-2017 / 17:26:39 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3884
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3885
8844
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3886
cot
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3887
    "return the cotangent of the receiver"
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3888
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3889
    ^ 1 / self tan
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3890
!
21e7c41e277e hyperbolic functions fixed
Claus Gittinger <cg@exept.de>
parents: 8830
diff changeset
  3891
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3892
csc
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3893
    "return the cosecant of the receiver (interpreted as radians)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3894
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3895
    ^ 1 / self sin
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3896
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3897
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3898
sec
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3899
    "return the secant of the receiver (interpreted as radians)"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3900
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3901
    ^ 1 / self cos
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3902
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3903
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3904
sin
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3905
    "return the sine of the receiver (interpreted as radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3906
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3907
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3908
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3909
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3910
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3911
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3912
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3913
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3914
            ^ f sin.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3915
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3916
    ].
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3917
    ^ self sin_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3918
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3919
    "Modified: / 05-07-2017 / 17:26:47 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3920
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3921
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3922
sinh
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3923
    "return the hyperbolic sine of the receiver"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3924
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3925
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3926
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3927
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3928
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3929
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3930
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3931
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3932
            ^ f sinh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3933
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3934
    ].
8634
2c838074e754 epsilon
Claus Gittinger <cg@exept.de>
parents: 8303
diff changeset
  3935
    ^ self sinh_withAccuracy:self epsilon
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3936
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3937
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3938
        10 sinh                     -> 11013.23287470339338
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3939
        (10 exp - (-10 exp)) / 2    -> 11013.23287470339338
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3940
    "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3941
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3942
    "Modified (comment): / 05-07-2017 / 17:32:27 / cg"
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3943
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3944
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3945
tan
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3946
    "return the tangens of the receiver (interpreted as radians)"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3947
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3948
    "/ slow fallback
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3949
    ^ self sin / self cos
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3950
!
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3951
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3952
tanh
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3953
    "return the hyperbolic tangens of the receiver"
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3954
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3955
    "/ tanh is:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3956
    "/      sinh(x)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3957
    "/      -------
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3958
    "/      cosh(x)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3959
    "/
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3960
    "/ which is:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3961
    "/      (exp(x) - exp(-x)) / 2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3962
    "/      ----------------------
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3963
    "/      (exp(x) + exp(-x)) / 2
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3964
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3965
    |exp nexp|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3966
    
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3967
    "/ if I am not a Float (or a less general lpReal),
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3968
    "/ retry after converting to float
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3969
    (self isLimitedPrecisionReal not
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3970
    or:[self generality < 1.0 generality]) ifTrue:[
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3971
        |f|
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3972
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3973
        (f := self asLongFloat) isFinite ifTrue:[
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3974
            ^ f tanh.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3975
        ].
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  3976
    ].
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3977
19769
57962c690836 #DOCUMENTATION by cg
Claus Gittinger <cg@exept.de>
parents: 19768
diff changeset
  3978
    "/ very slow fallback
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3979
    "/ assuming that if we arrive here, the stuff is taylor computed manually anyway,
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3980
    "/ the question is if taylor-for-exp converges faster than tailor-for-sin/cos
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3981
    "/ So it may be faster to:
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3982
    "/      ^ self sinh / self cosh
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3983
    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3984
    exp := self exp.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3985
    nexp := self negated exp.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3986
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3987
    ^ (exp - nexp) / (exp + nexp)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3988
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3989
    "Modified (comment): / 05-07-2017 / 17:34:59 / cg"
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3990
! !
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3991
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3992
!Number methodsFor:'trigonometric (degrees)'!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3993
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3994
degreeCos
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3995
    "Return the cosine of the receiver taken as an angle in degrees."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3996
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3997
    ^ self degreesToRadians cos
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3998
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  3999
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4000
degreeSin
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4001
    "Return the sine of the receiver taken as an angle in degrees."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4002
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4003
    ^ self degreesToRadians sin
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4004
!
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4005
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4006
degreeTan
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4007
    "Return the cosine of the receiver taken as an angle in degrees."
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4008
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4009
    ^ self degreesToRadians tan
7449
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  4010
! !
192789c6e1c2 fallback code for trigonometric;
Claus Gittinger <cg@exept.de>
parents: 7388
diff changeset
  4011
5552
31b5cc144476 category changes
Claus Gittinger <cg@exept.de>
parents: 5360
diff changeset
  4012
!Number methodsFor:'truncation & rounding'!
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4013
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4014
detentBy: detent atMultiplesOf: grid snap: snap
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4015
    "Map all values that are within detent/2 of any multiple of grid
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4016
     to that multiple.
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4017
     Otherwise, if snap is true, return self, meaning that the values
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4018
     in the dead zone will never be returned.
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4019
     If snap is false, then expand the range between dead zones
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4020
     so that it covers the range between multiples of the grid,
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4021
     and scale the value by that factor."
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4022
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4023
    | r1 r2 |
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4024
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4025
    r1 := self roundTo: grid.                    "Nearest multiple of grid"
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4026
    (self roundTo: detent) = r1 ifTrue: [^ r1].  "Snap to that multiple..."
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4027
    snap ifTrue: [^ self].                       "...or return self"
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4028
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4029
    r2 := self < r1                               "Nearest end of dead zone"
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4030
	    ifTrue: [r1 - (detent asFloat/2)]
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4031
	    ifFalse: [r1 + (detent asFloat/2)].
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4032
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4033
    "Scale values between dead zones to fill range between multiples"
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4034
    ^ r1 + ((self - r2) * grid asFloat / (grid - detent))
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4035
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4036
    "
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4037
     (170 to: 190 by: 2) collect: [:a | a detentBy: 10 atMultiplesOf: 90 snap: true]
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4038
     (170 to: 190 by: 2) collect: [:a | a detentBy: 10 atMultiplesOf: 90 snap: false]
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4039
     (3.9 to: 4.1 by: 0.02) collect: [:a | a detentBy: 0.1 atMultiplesOf: 1.0 snap: true]
4895
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4040
     (-3.9 to: -4.1 by: -0.02) collect: [:a | a detentBy: 0.1 atMultiplesOf: 1.0 snap: false]
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4041
    "
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4042
!
cc546b082506 checkin from browser
Claus Gittinger <cg@exept.de>
parents: 4682
diff changeset
  4043
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4044
fractionPart
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4045
    "return a number with value from digits after the decimal point.
7356
fe8fb0a571f2 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
  4046
     i.e. the receiver minus its truncated value,
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4047
     such that (self truncated + self fractionPart) = self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4048
     Floats will return an inexact float; fractions will return a fraction"
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4049
7356
fe8fb0a571f2 double dispatching fixed;
Claus Gittinger <cg@exept.de>
parents: 7261
diff changeset
  4050
    ^ self - self truncated
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4051
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4052
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4053
     1234.56789 fractionPart -- beware rounding errors in floats
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4054
     1.2345e0 fractionPart    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4055
     1.2345e1 fractionPart  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4056
     1.2345e6 fractionPart  
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4057
     (16/10) fractionPart    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4058
     (8/9) fractionPart    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4059
     (11/9) fractionPart    
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4060
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4061
     1.6 asLongFloat fractionPart + 1.6 asLongFloat truncated  -- beware rounding errors in floats 
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4062
     -1.6 asLongFloat fractionPart + -1.6 asLongFloat truncated -1.600000000000000089
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4063
     (16/10) fractionPart + (16/10) truncated -> 16/10
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4064
    "
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4065
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4066
    "Modified: / 4.11.1996 / 20:26:54 / cg"
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4067
    "Created: / 28.10.1998 / 17:14:40 / cg"
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4068
!
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4069
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4070
integerPart
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4071
    "return a number with value from digits before the decimal point.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4072
     (i.e. the value truncated towards zero)
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4073
     such that (self integerPart + self fractionPart) = self
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4074
     Floats will return an inexact float; fractions will return an exact integer.
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4075
     "
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4076
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4077
    ^ self truncated
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4078
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4079
    "
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4080
     1234.56789 integerPart  
20308
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4081
     1.2345e6 integerPart
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4082
     12.5 integerPart
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4083
     -12.5 integerPart
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4084
     (5/3) integerPart
9110f117d260 ALIGNMENT code clean up
Claus Gittinger <cg@exept.de>
parents: 20142
diff changeset
  4085
     (-5/3) integerPart
25426
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4086
     (5/3) truncated        
963f86568b2d Cherry-picked `Number`, `Integer`, `SmallInteger` and `LargeInteger` from a6b6dda4caff
Jan Vrany <jan.vrany@labware.com>
parents: 21242
diff changeset
  4087
     (-5/3) truncated 
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4088
    "
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4089
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4090
    "Created: / 28.10.1998 / 17:14:56 / cg"
6154
6cb999c5ace3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 6143
diff changeset
  4091
    "Modified: / 5.11.2001 / 17:54:22 / cg"
3900
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4092
! !
c3bc76767cfc added generic implementations of #fractionPart and #integerPart
Claus Gittinger <cg@exept.de>
parents: 3770
diff changeset
  4093
1892
d3564145c15c *** empty log message ***
Claus Gittinger <cg@exept.de>
parents: 1701
diff changeset
  4094
!Number class methodsFor:'documentation'!
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4095
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4096
version
18850
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
  4097
    ^ '$Header$'
12112
949f9713c4a5 changed: #readFrom:decimalPointCharacters:onError:
Claus Gittinger <cg@exept.de>
parents: 11944
diff changeset
  4098
!
949f9713c4a5 changed: #readFrom:decimalPointCharacters:onError:
Claus Gittinger <cg@exept.de>
parents: 11944
diff changeset
  4099
949f9713c4a5 changed: #readFrom:decimalPointCharacters:onError:
Claus Gittinger <cg@exept.de>
parents: 11944
diff changeset
  4100
version_CVS
18850
172da07a4529 #DOCUMENTATION
Claus Gittinger <cg@exept.de>
parents: 18320
diff changeset
  4101
    ^ '$Header$'
701
a309e3ef7faf checkin from browser
Claus Gittinger <cg@exept.de>
parents: 569
diff changeset
  4102
! !
15078
997a122ceeb5 class: Number
Stefan Vogel <sv@exept.de>
parents: 14495
diff changeset
  4103