lists.squeakfoundation.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Packages
May 2012
----- 2024 -----
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
packages@lists.squeakfoundation.org
1 participants
138 discussions
Start a n
N
ew thread
The Trunk: Kernel-nice.691.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.691.mcz
==================== Summary ==================== Name: Kernel-nice.691 Author: nice Time: 22 May 2012, 10:14:29.897 pm UUID: f69b524f-83bb-4ef0-b084-e7a96dd5d33e Ancestors: Kernel-eem.690, Kernel-nice.690 Grace period is over, publish and merge the changes for printing Floating point with fixed precision. =============== Diff against Kernel-eem.690 =============== Item was added: + ----- Method: Float>>absPrintExactlyOn:base:decimalPlaces:showTrailingFractionalZeros: (in category 'printing') ----- + absPrintExactlyOn: aStream base: base decimalPlaces: placesDesired showTrailingFractionalZeros: showtrailingZeros + "Print my value on a stream in the given base with fixed number of digits after floating point. + When placesDesired are beyond Float precision, zeroes are appended. + When showtrailingZeros is false, the trailing zeroes after decimal point will be omitted. + If all fractional digits are zeros, the decimal point is omitted too. + Assumes that my value is strictly positive; negative numbers, zero, and NaNs have already been handled elsewhere. + Based upon the algorithm outlined in: + Robert G. Burger and R. Kent Dybvig + Printing Floating Point Numbers Quickly and Accurately + ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation + June 1996.." + + | significand exp baseExpEstimate r s mPlus mMinus scale roundingLowIncludesLimits roundingHighIncludesLimits d tc1 tc2 decPointCount slowbit shead delta | + self isInfinite ifTrue: [aStream nextPutAll: 'Infinity'. ^ self]. + significand := self significandAsInteger. + exp := (self exponent - 52) max: MinValLogBase2. + exp >= 0 + ifTrue: + [significand ~= 16r10000000000000 + ifTrue: + [r := significand bitShift: 1 + exp. + s := 2. + mPlus := mMinus := 1 bitShift: exp] + ifFalse: + [r := significand bitShift: 2 + exp. + s := 4. + mPlus := 2 * (mMinus := 1 bitShift: exp)]] + ifFalse: + [(exp = MinValLogBase2 or: [significand ~= 16r10000000000000]) + ifTrue: + [r := significand bitShift: 1. + s := 1 bitShift: 1 - exp. + mPlus := mMinus := 1] + ifFalse: + [r := significand bitShift: 2. + s := 1 bitShift: 2 - exp. + mPlus := 2. + mMinus := 1]]. + delta := s / 2 / (base raisedTo: placesDesired). + roundingLowIncludesLimits := (mMinus < delta and: [mMinus := delta. true]) or: [significand even]. + roundingHighIncludesLimits := (mPlus < delta and: [mPlus := delta. true]) or: [significand even]. + baseExpEstimate := (self exponent * base asFloat reciprocalLogBase2 - 1.0e-10) ceiling. + baseExpEstimate >= 0 + ifTrue: [s := s * (base raisedToInteger: baseExpEstimate)] + ifFalse: + [scale := base raisedToInteger: baseExpEstimate negated. + r := r * scale. + mPlus := mPlus * scale. + mMinus := mMinus * scale]. + ((r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]]) + ifTrue: [baseExpEstimate := baseExpEstimate + 1] + ifFalse: + [r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base]. + decPointCount := baseExpEstimate. + baseExpEstimate <= 0 + ifTrue: + [placesDesired + baseExpEstimate <= 0 + ifTrue: + [aStream nextPut: $0. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]. + ^self]. + aStream nextPutAll: '0.'; nextPutAll: (String new: 0 - baseExpEstimate withAll: $0)]. + slowbit := 1 - s lowBit . + shead := s bitShift: slowbit. + [d := (r bitShift: slowbit) // shead. + r := r - (d * s). + (tc1 := (r <= mMinus) and: [roundingLowIncludesLimits or: [r < mMinus]]) | + (tc2 := (r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]])] whileFalse: + [aStream nextPut: (Character digitValue: d). + r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base. + (decPointCount := decPointCount - 1) = 0 ifTrue: [aStream nextPut: $.]]. + tc2 ifTrue: + [(tc1 not or: [r * 2 >= s]) ifTrue: [d := d + 1]]. + aStream nextPut: (Character digitValue: d). + decPointCount > 0 + ifTrue: + [decPointCount - 1 to: 1 by: -1 do: [:i | aStream nextPut: $0]. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]] + ifFalse: + [(showtrailingZeros and: [placesDesired + decPointCount > 1]) ifTrue: [aStream nextPutAll: (String new: placesDesired + decPointCount - 1 withAll: $0)]].! Item was changed: + ----- Method: Float>>absPrintOn:base:digitCount: (in category 'printing') ----- - ----- Method: Float>>absPrintOn:base:digitCount: (in category 'private') ----- absPrintOn: aStream base: base digitCount: digitCount "Print me in the given base, using digitCount significant figures." | fuzz x exp q fBase scale logScale xi | self isInfinite ifTrue: [^ aStream nextPutAll: 'Inf']. fBase := base asFloat. "x is myself normalized to [1.0, fBase), exp is my exponent" exp := self < 1.0 ifTrue: [self reciprocalFloorLog: fBase] ifFalse: [self floorLog: fBase]. scale := 1.0. logScale := 0. [(x := fBase raisedTo: (exp + logScale)) = 0] whileTrue: [scale := scale * fBase. logScale := logScale + 1]. x := self * scale / x. fuzz := fBase raisedTo: 1 - digitCount. "round the last digit to be printed" x := 0.5 * fuzz + x. x >= fBase ifTrue: ["check if rounding has unnormalized x" x := x / fBase. exp := exp + 1]. (exp < 6 and: [exp > -4]) ifTrue: ["decimal notation" q := 0. exp < 0 ifTrue: [1 to: 1 - exp do: [:i | aStream nextPut: ('0.0000' at: i)]]] ifFalse: ["scientific notation" q := exp. exp := 0]. [x >= fuzz] whileTrue: ["use fuzz to track significance" xi := x asInteger. aStream nextPut: (Character digitValue: xi). x := x - xi asFloat * fBase. fuzz := fuzz * fBase. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. [exp >= -1] whileTrue: [aStream nextPut: $0. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. q ~= 0 ifTrue: [aStream nextPut: $e. q printOn: aStream]! Item was added: + ----- Method: Float>>printOn:maxDecimalPlaces: (in category 'printing') ----- + printOn: aStream maxDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false]]! Item was added: + ----- Method: Float>>printOn:showingDecimalPlaces: (in category 'printing') ----- + printOn: aStream showingDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true]]! Item was removed: - ----- Method: Float>>printShowingDecimalPlaces: (in category 'printing') ----- - printShowingDecimalPlaces: placesDesired - "This implementation avoids any rounding error caused by rounded or roundTo:" - - self isFinite ifFalse: [^self printString]. - ^self asTrueFraction printShowingDecimalPlaces: placesDesired!
1
0
0
0
The Trunk: Kernel-nice.691.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.691.mcz
==================== Summary ==================== Name: Kernel-nice.691 Author: nice Time: 22 May 2012, 10:14:29.897 pm UUID: f69b524f-83bb-4ef0-b084-e7a96dd5d33e Ancestors: Kernel-eem.690, Kernel-nice.690 Grace period is over, publish and merge the changes for printing Floating point with fixed precision. =============== Diff against Kernel-eem.690 =============== Item was added: + ----- Method: Float>>absPrintExactlyOn:base:decimalPlaces:showTrailingFractionalZeros: (in category 'printing') ----- + absPrintExactlyOn: aStream base: base decimalPlaces: placesDesired showTrailingFractionalZeros: showtrailingZeros + "Print my value on a stream in the given base with fixed number of digits after floating point. + When placesDesired are beyond Float precision, zeroes are appended. + When showtrailingZeros is false, the trailing zeroes after decimal point will be omitted. + If all fractional digits are zeros, the decimal point is omitted too. + Assumes that my value is strictly positive; negative numbers, zero, and NaNs have already been handled elsewhere. + Based upon the algorithm outlined in: + Robert G. Burger and R. Kent Dybvig + Printing Floating Point Numbers Quickly and Accurately + ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation + June 1996.." + + | significand exp baseExpEstimate r s mPlus mMinus scale roundingLowIncludesLimits roundingHighIncludesLimits d tc1 tc2 decPointCount slowbit shead delta | + self isInfinite ifTrue: [aStream nextPutAll: 'Infinity'. ^ self]. + significand := self significandAsInteger. + exp := (self exponent - 52) max: MinValLogBase2. + exp >= 0 + ifTrue: + [significand ~= 16r10000000000000 + ifTrue: + [r := significand bitShift: 1 + exp. + s := 2. + mPlus := mMinus := 1 bitShift: exp] + ifFalse: + [r := significand bitShift: 2 + exp. + s := 4. + mPlus := 2 * (mMinus := 1 bitShift: exp)]] + ifFalse: + [(exp = MinValLogBase2 or: [significand ~= 16r10000000000000]) + ifTrue: + [r := significand bitShift: 1. + s := 1 bitShift: 1 - exp. + mPlus := mMinus := 1] + ifFalse: + [r := significand bitShift: 2. + s := 1 bitShift: 2 - exp. + mPlus := 2. + mMinus := 1]]. + delta := s / 2 / (base raisedTo: placesDesired). + roundingLowIncludesLimits := (mMinus < delta and: [mMinus := delta. true]) or: [significand even]. + roundingHighIncludesLimits := (mPlus < delta and: [mPlus := delta. true]) or: [significand even]. + baseExpEstimate := (self exponent * base asFloat reciprocalLogBase2 - 1.0e-10) ceiling. + baseExpEstimate >= 0 + ifTrue: [s := s * (base raisedToInteger: baseExpEstimate)] + ifFalse: + [scale := base raisedToInteger: baseExpEstimate negated. + r := r * scale. + mPlus := mPlus * scale. + mMinus := mMinus * scale]. + ((r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]]) + ifTrue: [baseExpEstimate := baseExpEstimate + 1] + ifFalse: + [r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base]. + decPointCount := baseExpEstimate. + baseExpEstimate <= 0 + ifTrue: + [placesDesired + baseExpEstimate <= 0 + ifTrue: + [aStream nextPut: $0. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]. + ^self]. + aStream nextPutAll: '0.'; nextPutAll: (String new: 0 - baseExpEstimate withAll: $0)]. + slowbit := 1 - s lowBit . + shead := s bitShift: slowbit. + [d := (r bitShift: slowbit) // shead. + r := r - (d * s). + (tc1 := (r <= mMinus) and: [roundingLowIncludesLimits or: [r < mMinus]]) | + (tc2 := (r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]])] whileFalse: + [aStream nextPut: (Character digitValue: d). + r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base. + (decPointCount := decPointCount - 1) = 0 ifTrue: [aStream nextPut: $.]]. + tc2 ifTrue: + [(tc1 not or: [r * 2 >= s]) ifTrue: [d := d + 1]]. + aStream nextPut: (Character digitValue: d). + decPointCount > 0 + ifTrue: + [decPointCount - 1 to: 1 by: -1 do: [:i | aStream nextPut: $0]. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]] + ifFalse: + [(showtrailingZeros and: [placesDesired + decPointCount > 1]) ifTrue: [aStream nextPutAll: (String new: placesDesired + decPointCount - 1 withAll: $0)]].! Item was changed: + ----- Method: Float>>absPrintOn:base:digitCount: (in category 'printing') ----- - ----- Method: Float>>absPrintOn:base:digitCount: (in category 'private') ----- absPrintOn: aStream base: base digitCount: digitCount "Print me in the given base, using digitCount significant figures." | fuzz x exp q fBase scale logScale xi | self isInfinite ifTrue: [^ aStream nextPutAll: 'Inf']. fBase := base asFloat. "x is myself normalized to [1.0, fBase), exp is my exponent" exp := self < 1.0 ifTrue: [self reciprocalFloorLog: fBase] ifFalse: [self floorLog: fBase]. scale := 1.0. logScale := 0. [(x := fBase raisedTo: (exp + logScale)) = 0] whileTrue: [scale := scale * fBase. logScale := logScale + 1]. x := self * scale / x. fuzz := fBase raisedTo: 1 - digitCount. "round the last digit to be printed" x := 0.5 * fuzz + x. x >= fBase ifTrue: ["check if rounding has unnormalized x" x := x / fBase. exp := exp + 1]. (exp < 6 and: [exp > -4]) ifTrue: ["decimal notation" q := 0. exp < 0 ifTrue: [1 to: 1 - exp do: [:i | aStream nextPut: ('0.0000' at: i)]]] ifFalse: ["scientific notation" q := exp. exp := 0]. [x >= fuzz] whileTrue: ["use fuzz to track significance" xi := x asInteger. aStream nextPut: (Character digitValue: xi). x := x - xi asFloat * fBase. fuzz := fuzz * fBase. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. [exp >= -1] whileTrue: [aStream nextPut: $0. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. q ~= 0 ifTrue: [aStream nextPut: $e. q printOn: aStream]! Item was added: + ----- Method: Float>>printOn:maxDecimalPlaces: (in category 'printing') ----- + printOn: aStream maxDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false]]! Item was added: + ----- Method: Float>>printOn:showingDecimalPlaces: (in category 'printing') ----- + printOn: aStream showingDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true]]! Item was removed: - ----- Method: Float>>printShowingDecimalPlaces: (in category 'printing') ----- - printShowingDecimalPlaces: placesDesired - "This implementation avoids any rounding error caused by rounded or roundTo:" - - self isFinite ifFalse: [^self printString]. - ^self asTrueFraction printShowingDecimalPlaces: placesDesired!
1
0
0
0
The Trunk: KernelTests-nice.220.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of KernelTests to project The Trunk:
http://source.squeak.org/trunk/KernelTests-nice.220.mcz
==================== Summary ==================== Name: KernelTests-nice.220 Author: nice Time: 20 May 2012, 10:08:28.133 am UUID: ce026172-1559-454c-80f4-92f5d33f5f39 Ancestors: KernelTests-nice.219 Change this test (-0.001 printShowingDecimalPlaces: 2) = '-0.00' instead of '0.00' to reflect Kernel-nice.690 feature. =============== Diff against KernelTests-nice.219 =============== Item was changed: ----- Method: NumberTest>>testPrintShowingDecimalPlaces (in category 'tests') ----- testPrintShowingDecimalPlaces self assert: (111.2 printShowingDecimalPlaces: 2) = '111.20'. self assert: (111.2 printShowingDecimalPlaces: 0) = '111'. self assert: (111 printShowingDecimalPlaces: 0) = '111'. self assert: (111111111111111 printShowingDecimalPlaces: 2) = '111111111111111.00'. self assert: (10 printShowingDecimalPlaces: 20) ='10.00000000000000000000'. self assert: (0.98 printShowingDecimalPlaces: 2) = '0.98'. self assert: (-0.98 printShowingDecimalPlaces: 2) = '-0.98'. self assert: (2.567 printShowingDecimalPlaces: 2) = '2.57'. self assert: (-2.567 printShowingDecimalPlaces: 2) = '-2.57'. self assert: (0.01 printShowingDecimalPlaces: 2) = '0.01'. + self assert: (-0.001 printShowingDecimalPlaces: 2) = '-0.00'.! - self assert: (-0.001 printShowingDecimalPlaces: 2) = '0.00'.!
1
0
0
0
The Trunk: Kernel-nice.690.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.690.mcz
==================== Summary ==================== Name: Kernel-nice.690 Author: nice Time: 20 May 2012, 10:05:07.444 am UUID: 2c2aba8b-d8bd-4ec3-8b88-a873de9c68c4 Ancestors: Kernel-nice.689 1) Correct the very new #printOn:maxDecimalPlaces: which often rounds inexactly for large Float or large number of digits. Rationale: the printed representation shall be rounded exactly 2) Don't print arbitrary digits beyond Float precision, just print zeros (0.1 printShowingDecimalPlaces: 20) now prints '0.10000000000000000000' instead of '0.10000000000000000555', Rationale: those digits, while reflecting internal representation exactly, are totally insignificant and could be replaced with any other digits, while still representing the same Float. 3) Print the negative sign, even if the number vanishes to zero at prescribed decimal places (-0.001 printShowingDecimalPlaces: 2) now prints '-0.00' instead of '0.00', Rationale: this behaves like classical lib printf, and is in the spirit of Float negativeZero printString: when the precision vanishes, the Float keeps its sign. Note: I find the scheme feature which prints # for insignificant digits is very nice, but we should find a re-interpretable format... Implementation details: Of course, algorithms are taken from: Robert G. Burger and R. Kent Dybvig Printing Floating Point Numbers Quickly and Accurately ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation June 1996. Note that there is lot of duplicated code between free format and fixed format Float printing. And we should also fix the case of fixed number of digits #absPrintOn:base:digitCount: ... =============== Diff against Kernel-nice.689 =============== Item was added: + ----- Method: Float>>absPrintExactlyOn:base:decimalPlaces:showTrailingFractionalZeros: (in category 'printing') ----- + absPrintExactlyOn: aStream base: base decimalPlaces: placesDesired showTrailingFractionalZeros: showtrailingZeros + "Print my value on a stream in the given base with fixed number of digits after floating point. + When placesDesired are beyond Float precision, zeroes are appended. + When showtrailingZeros is false, the trailing zeroes after decimal point will be omitted. + If all fractional digits are zeros, the decimal point is omitted too. + Assumes that my value is strictly positive; negative numbers, zero, and NaNs have already been handled elsewhere. + Based upon the algorithm outlined in: + Robert G. Burger and R. Kent Dybvig + Printing Floating Point Numbers Quickly and Accurately + ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation + June 1996.." + + | significand exp baseExpEstimate r s mPlus mMinus scale roundingLowIncludesLimits roundingHighIncludesLimits d tc1 tc2 decPointCount slowbit shead delta | + self isInfinite ifTrue: [aStream nextPutAll: 'Infinity'. ^ self]. + significand := self significandAsInteger. + exp := (self exponent - 52) max: MinValLogBase2. + exp >= 0 + ifTrue: + [significand ~= 16r10000000000000 + ifTrue: + [r := significand bitShift: 1 + exp. + s := 2. + mPlus := mMinus := 1 bitShift: exp] + ifFalse: + [r := significand bitShift: 2 + exp. + s := 4. + mPlus := 2 * (mMinus := 1 bitShift: exp)]] + ifFalse: + [(exp = MinValLogBase2 or: [significand ~= 16r10000000000000]) + ifTrue: + [r := significand bitShift: 1. + s := 1 bitShift: 1 - exp. + mPlus := mMinus := 1] + ifFalse: + [r := significand bitShift: 2. + s := 1 bitShift: 2 - exp. + mPlus := 2. + mMinus := 1]]. + delta := s / 2 / (base raisedTo: placesDesired). + roundingLowIncludesLimits := (mMinus < delta and: [mMinus := delta. true]) or: [significand even]. + roundingHighIncludesLimits := (mPlus < delta and: [mPlus := delta. true]) or: [significand even]. + baseExpEstimate := (self exponent * base asFloat reciprocalLogBase2 - 1.0e-10) ceiling. + baseExpEstimate >= 0 + ifTrue: [s := s * (base raisedToInteger: baseExpEstimate)] + ifFalse: + [scale := base raisedToInteger: baseExpEstimate negated. + r := r * scale. + mPlus := mPlus * scale. + mMinus := mMinus * scale]. + ((r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]]) + ifTrue: [baseExpEstimate := baseExpEstimate + 1] + ifFalse: + [r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base]. + decPointCount := baseExpEstimate. + baseExpEstimate <= 0 + ifTrue: + [placesDesired + baseExpEstimate <= 0 + ifTrue: + [aStream nextPut: $0. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]. + ^self]. + aStream nextPutAll: '0.'; nextPutAll: (String new: 0 - baseExpEstimate withAll: $0)]. + slowbit := 1 - s lowBit . + shead := s bitShift: slowbit. + [d := (r bitShift: slowbit) // shead. + r := r - (d * s). + (tc1 := (r <= mMinus) and: [roundingLowIncludesLimits or: [r < mMinus]]) | + (tc2 := (r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]])] whileFalse: + [aStream nextPut: (Character digitValue: d). + r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base. + (decPointCount := decPointCount - 1) = 0 ifTrue: [aStream nextPut: $.]]. + tc2 ifTrue: + [(tc1 not or: [r * 2 >= s]) ifTrue: [d := d + 1]]. + aStream nextPut: (Character digitValue: d). + decPointCount > 0 + ifTrue: + [decPointCount - 1 to: 1 by: -1 do: [:i | aStream nextPut: $0]. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]] + ifFalse: + [(showtrailingZeros and: [placesDesired + decPointCount > 1]) ifTrue: [aStream nextPutAll: (String new: placesDesired + decPointCount - 1 withAll: $0)]].! Item was changed: + ----- Method: Float>>absPrintOn:base:digitCount: (in category 'printing') ----- - ----- Method: Float>>absPrintOn:base:digitCount: (in category 'private') ----- absPrintOn: aStream base: base digitCount: digitCount "Print me in the given base, using digitCount significant figures." | fuzz x exp q fBase scale logScale xi | self isInfinite ifTrue: [^ aStream nextPutAll: 'Inf']. fBase := base asFloat. "x is myself normalized to [1.0, fBase), exp is my exponent" exp := self < 1.0 ifTrue: [self reciprocalFloorLog: fBase] ifFalse: [self floorLog: fBase]. scale := 1.0. logScale := 0. [(x := fBase raisedTo: (exp + logScale)) = 0] whileTrue: [scale := scale * fBase. logScale := logScale + 1]. x := self * scale / x. fuzz := fBase raisedTo: 1 - digitCount. "round the last digit to be printed" x := 0.5 * fuzz + x. x >= fBase ifTrue: ["check if rounding has unnormalized x" x := x / fBase. exp := exp + 1]. (exp < 6 and: [exp > -4]) ifTrue: ["decimal notation" q := 0. exp < 0 ifTrue: [1 to: 1 - exp do: [:i | aStream nextPut: ('0.0000' at: i)]]] ifFalse: ["scientific notation" q := exp. exp := 0]. [x >= fuzz] whileTrue: ["use fuzz to track significance" xi := x asInteger. aStream nextPut: (Character digitValue: xi). x := x - xi asFloat * fBase. fuzz := fuzz * fBase. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. [exp >= -1] whileTrue: [aStream nextPut: $0. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. q ~= 0 ifTrue: [aStream nextPut: $e. q printOn: aStream]! Item was added: + ----- Method: Float>>printOn:maxDecimalPlaces: (in category 'printing') ----- + printOn: aStream maxDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false]]! Item was added: + ----- Method: Float>>printOn:showingDecimalPlaces: (in category 'printing') ----- + printOn: aStream showingDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true]]! Item was removed: - ----- Method: Float>>printShowingDecimalPlaces: (in category 'printing') ----- - printShowingDecimalPlaces: placesDesired - "This implementation avoids any rounding error caused by rounded or roundTo:" - - self isFinite ifFalse: [^self printString]. - ^self asTrueFraction printShowingDecimalPlaces: placesDesired!
1
0
0
0
The Trunk: KernelTests-nice.220.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of KernelTests to project The Trunk:
http://source.squeak.org/trunk/KernelTests-nice.220.mcz
==================== Summary ==================== Name: KernelTests-nice.220 Author: nice Time: 20 May 2012, 10:08:28.133 am UUID: ce026172-1559-454c-80f4-92f5d33f5f39 Ancestors: KernelTests-nice.219 Change this test (-0.001 printShowingDecimalPlaces: 2) = '-0.00' instead of '0.00' to reflect Kernel-nice.690 feature. =============== Diff against KernelTests-nice.219 =============== Item was changed: ----- Method: NumberTest>>testPrintShowingDecimalPlaces (in category 'tests') ----- testPrintShowingDecimalPlaces self assert: (111.2 printShowingDecimalPlaces: 2) = '111.20'. self assert: (111.2 printShowingDecimalPlaces: 0) = '111'. self assert: (111 printShowingDecimalPlaces: 0) = '111'. self assert: (111111111111111 printShowingDecimalPlaces: 2) = '111111111111111.00'. self assert: (10 printShowingDecimalPlaces: 20) ='10.00000000000000000000'. self assert: (0.98 printShowingDecimalPlaces: 2) = '0.98'. self assert: (-0.98 printShowingDecimalPlaces: 2) = '-0.98'. self assert: (2.567 printShowingDecimalPlaces: 2) = '2.57'. self assert: (-2.567 printShowingDecimalPlaces: 2) = '-2.57'. self assert: (0.01 printShowingDecimalPlaces: 2) = '0.01'. + self assert: (-0.001 printShowingDecimalPlaces: 2) = '-0.00'.! - self assert: (-0.001 printShowingDecimalPlaces: 2) = '0.00'.!
1
0
0
0
The Trunk: Kernel-nice.690.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.690.mcz
==================== Summary ==================== Name: Kernel-nice.690 Author: nice Time: 20 May 2012, 10:05:07.444 am UUID: 2c2aba8b-d8bd-4ec3-8b88-a873de9c68c4 Ancestors: Kernel-nice.689 1) Correct the very new #printOn:maxDecimalPlaces: which often rounds inexactly for large Float or large number of digits. Rationale: the printed representation shall be rounded exactly 2) Don't print arbitrary digits beyond Float precision, just print zeros (0.1 printShowingDecimalPlaces: 20) now prints '0.10000000000000000000' instead of '0.10000000000000000555', Rationale: those digits, while reflecting internal representation exactly, are totally insignificant and could be replaced with any other digits, while still representing the same Float. 3) Print the negative sign, even if the number vanishes to zero at prescribed decimal places (-0.001 printShowingDecimalPlaces: 2) now prints '-0.00' instead of '0.00', Rationale: this behaves like classical lib printf, and is in the spirit of Float negativeZero printString: when the precision vanishes, the Float keeps its sign. Note: I find the scheme feature which prints # for insignificant digits is very nice, but we should find a re-interpretable format... Implementation details: Of course, algorithms are taken from: Robert G. Burger and R. Kent Dybvig Printing Floating Point Numbers Quickly and Accurately ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation June 1996. Note that there is lot of duplicated code between free format and fixed format Float printing. And we should also fix the case of fixed number of digits #absPrintOn:base:digitCount: ... =============== Diff against Kernel-nice.689 =============== Item was added: + ----- Method: Float>>absPrintExactlyOn:base:decimalPlaces:showTrailingFractionalZeros: (in category 'printing') ----- + absPrintExactlyOn: aStream base: base decimalPlaces: placesDesired showTrailingFractionalZeros: showtrailingZeros + "Print my value on a stream in the given base with fixed number of digits after floating point. + When placesDesired are beyond Float precision, zeroes are appended. + When showtrailingZeros is false, the trailing zeroes after decimal point will be omitted. + If all fractional digits are zeros, the decimal point is omitted too. + Assumes that my value is strictly positive; negative numbers, zero, and NaNs have already been handled elsewhere. + Based upon the algorithm outlined in: + Robert G. Burger and R. Kent Dybvig + Printing Floating Point Numbers Quickly and Accurately + ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation + June 1996.." + + | significand exp baseExpEstimate r s mPlus mMinus scale roundingLowIncludesLimits roundingHighIncludesLimits d tc1 tc2 decPointCount slowbit shead delta | + self isInfinite ifTrue: [aStream nextPutAll: 'Infinity'. ^ self]. + significand := self significandAsInteger. + exp := (self exponent - 52) max: MinValLogBase2. + exp >= 0 + ifTrue: + [significand ~= 16r10000000000000 + ifTrue: + [r := significand bitShift: 1 + exp. + s := 2. + mPlus := mMinus := 1 bitShift: exp] + ifFalse: + [r := significand bitShift: 2 + exp. + s := 4. + mPlus := 2 * (mMinus := 1 bitShift: exp)]] + ifFalse: + [(exp = MinValLogBase2 or: [significand ~= 16r10000000000000]) + ifTrue: + [r := significand bitShift: 1. + s := 1 bitShift: 1 - exp. + mPlus := mMinus := 1] + ifFalse: + [r := significand bitShift: 2. + s := 1 bitShift: 2 - exp. + mPlus := 2. + mMinus := 1]]. + delta := s / 2 / (base raisedTo: placesDesired). + roundingLowIncludesLimits := (mMinus < delta and: [mMinus := delta. true]) or: [significand even]. + roundingHighIncludesLimits := (mPlus < delta and: [mPlus := delta. true]) or: [significand even]. + baseExpEstimate := (self exponent * base asFloat reciprocalLogBase2 - 1.0e-10) ceiling. + baseExpEstimate >= 0 + ifTrue: [s := s * (base raisedToInteger: baseExpEstimate)] + ifFalse: + [scale := base raisedToInteger: baseExpEstimate negated. + r := r * scale. + mPlus := mPlus * scale. + mMinus := mMinus * scale]. + ((r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]]) + ifTrue: [baseExpEstimate := baseExpEstimate + 1] + ifFalse: + [r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base]. + decPointCount := baseExpEstimate. + baseExpEstimate <= 0 + ifTrue: + [placesDesired + baseExpEstimate <= 0 + ifTrue: + [aStream nextPut: $0. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]. + ^self]. + aStream nextPutAll: '0.'; nextPutAll: (String new: 0 - baseExpEstimate withAll: $0)]. + slowbit := 1 - s lowBit . + shead := s bitShift: slowbit. + [d := (r bitShift: slowbit) // shead. + r := r - (d * s). + (tc1 := (r <= mMinus) and: [roundingLowIncludesLimits or: [r < mMinus]]) | + (tc2 := (r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]])] whileFalse: + [aStream nextPut: (Character digitValue: d). + r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base. + (decPointCount := decPointCount - 1) = 0 ifTrue: [aStream nextPut: $.]]. + tc2 ifTrue: + [(tc1 not or: [r * 2 >= s]) ifTrue: [d := d + 1]]. + aStream nextPut: (Character digitValue: d). + decPointCount > 0 + ifTrue: + [decPointCount - 1 to: 1 by: -1 do: [:i | aStream nextPut: $0]. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]] + ifFalse: + [(showtrailingZeros and: [placesDesired + decPointCount > 1]) ifTrue: [aStream nextPutAll: (String new: placesDesired + decPointCount - 1 withAll: $0)]].! Item was changed: + ----- Method: Float>>absPrintOn:base:digitCount: (in category 'printing') ----- - ----- Method: Float>>absPrintOn:base:digitCount: (in category 'private') ----- absPrintOn: aStream base: base digitCount: digitCount "Print me in the given base, using digitCount significant figures." | fuzz x exp q fBase scale logScale xi | self isInfinite ifTrue: [^ aStream nextPutAll: 'Inf']. fBase := base asFloat. "x is myself normalized to [1.0, fBase), exp is my exponent" exp := self < 1.0 ifTrue: [self reciprocalFloorLog: fBase] ifFalse: [self floorLog: fBase]. scale := 1.0. logScale := 0. [(x := fBase raisedTo: (exp + logScale)) = 0] whileTrue: [scale := scale * fBase. logScale := logScale + 1]. x := self * scale / x. fuzz := fBase raisedTo: 1 - digitCount. "round the last digit to be printed" x := 0.5 * fuzz + x. x >= fBase ifTrue: ["check if rounding has unnormalized x" x := x / fBase. exp := exp + 1]. (exp < 6 and: [exp > -4]) ifTrue: ["decimal notation" q := 0. exp < 0 ifTrue: [1 to: 1 - exp do: [:i | aStream nextPut: ('0.0000' at: i)]]] ifFalse: ["scientific notation" q := exp. exp := 0]. [x >= fuzz] whileTrue: ["use fuzz to track significance" xi := x asInteger. aStream nextPut: (Character digitValue: xi). x := x - xi asFloat * fBase. fuzz := fuzz * fBase. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. [exp >= -1] whileTrue: [aStream nextPut: $0. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. q ~= 0 ifTrue: [aStream nextPut: $e. q printOn: aStream]! Item was added: + ----- Method: Float>>printOn:maxDecimalPlaces: (in category 'printing') ----- + printOn: aStream maxDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false]]! Item was added: + ----- Method: Float>>printOn:showingDecimalPlaces: (in category 'printing') ----- + printOn: aStream showingDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true]]! Item was removed: - ----- Method: Float>>printShowingDecimalPlaces: (in category 'printing') ----- - printShowingDecimalPlaces: placesDesired - "This implementation avoids any rounding error caused by rounded or roundTo:" - - self isFinite ifFalse: [^self printString]. - ^self asTrueFraction printShowingDecimalPlaces: placesDesired!
1
0
0
0
The Trunk: KernelTests-nice.220.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of KernelTests to project The Trunk:
http://source.squeak.org/trunk/KernelTests-nice.220.mcz
==================== Summary ==================== Name: KernelTests-nice.220 Author: nice Time: 20 May 2012, 10:08:28.133 am UUID: ce026172-1559-454c-80f4-92f5d33f5f39 Ancestors: KernelTests-nice.219 Change this test (-0.001 printShowingDecimalPlaces: 2) = '-0.00' instead of '0.00' to reflect Kernel-nice.690 feature. =============== Diff against KernelTests-nice.219 =============== Item was changed: ----- Method: NumberTest>>testPrintShowingDecimalPlaces (in category 'tests') ----- testPrintShowingDecimalPlaces self assert: (111.2 printShowingDecimalPlaces: 2) = '111.20'. self assert: (111.2 printShowingDecimalPlaces: 0) = '111'. self assert: (111 printShowingDecimalPlaces: 0) = '111'. self assert: (111111111111111 printShowingDecimalPlaces: 2) = '111111111111111.00'. self assert: (10 printShowingDecimalPlaces: 20) ='10.00000000000000000000'. self assert: (0.98 printShowingDecimalPlaces: 2) = '0.98'. self assert: (-0.98 printShowingDecimalPlaces: 2) = '-0.98'. self assert: (2.567 printShowingDecimalPlaces: 2) = '2.57'. self assert: (-2.567 printShowingDecimalPlaces: 2) = '-2.57'. self assert: (0.01 printShowingDecimalPlaces: 2) = '0.01'. + self assert: (-0.001 printShowingDecimalPlaces: 2) = '-0.00'.! - self assert: (-0.001 printShowingDecimalPlaces: 2) = '0.00'.!
1
0
0
0
The Trunk: Kernel-nice.690.mcz
by commits@source.squeak.org
22 May '12
22 May '12
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.690.mcz
==================== Summary ==================== Name: Kernel-nice.690 Author: nice Time: 20 May 2012, 10:05:07.444 am UUID: 2c2aba8b-d8bd-4ec3-8b88-a873de9c68c4 Ancestors: Kernel-nice.689 1) Correct the very new #printOn:maxDecimalPlaces: which often rounds inexactly for large Float or large number of digits. Rationale: the printed representation shall be rounded exactly 2) Don't print arbitrary digits beyond Float precision, just print zeros (0.1 printShowingDecimalPlaces: 20) now prints '0.10000000000000000000' instead of '0.10000000000000000555', Rationale: those digits, while reflecting internal representation exactly, are totally insignificant and could be replaced with any other digits, while still representing the same Float. 3) Print the negative sign, even if the number vanishes to zero at prescribed decimal places (-0.001 printShowingDecimalPlaces: 2) now prints '-0.00' instead of '0.00', Rationale: this behaves like classical lib printf, and is in the spirit of Float negativeZero printString: when the precision vanishes, the Float keeps its sign. Note: I find the scheme feature which prints # for insignificant digits is very nice, but we should find a re-interpretable format... Implementation details: Of course, algorithms are taken from: Robert G. Burger and R. Kent Dybvig Printing Floating Point Numbers Quickly and Accurately ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation June 1996. Note that there is lot of duplicated code between free format and fixed format Float printing. And we should also fix the case of fixed number of digits #absPrintOn:base:digitCount: ... =============== Diff against Kernel-nice.689 =============== Item was added: + ----- Method: Float>>absPrintExactlyOn:base:decimalPlaces:showTrailingFractionalZeros: (in category 'printing') ----- + absPrintExactlyOn: aStream base: base decimalPlaces: placesDesired showTrailingFractionalZeros: showtrailingZeros + "Print my value on a stream in the given base with fixed number of digits after floating point. + When placesDesired are beyond Float precision, zeroes are appended. + When showtrailingZeros is false, the trailing zeroes after decimal point will be omitted. + If all fractional digits are zeros, the decimal point is omitted too. + Assumes that my value is strictly positive; negative numbers, zero, and NaNs have already been handled elsewhere. + Based upon the algorithm outlined in: + Robert G. Burger and R. Kent Dybvig + Printing Floating Point Numbers Quickly and Accurately + ACM SIGPLAN 1996 Conference on Programming Language Design and Implementation + June 1996.." + + | significand exp baseExpEstimate r s mPlus mMinus scale roundingLowIncludesLimits roundingHighIncludesLimits d tc1 tc2 decPointCount slowbit shead delta | + self isInfinite ifTrue: [aStream nextPutAll: 'Infinity'. ^ self]. + significand := self significandAsInteger. + exp := (self exponent - 52) max: MinValLogBase2. + exp >= 0 + ifTrue: + [significand ~= 16r10000000000000 + ifTrue: + [r := significand bitShift: 1 + exp. + s := 2. + mPlus := mMinus := 1 bitShift: exp] + ifFalse: + [r := significand bitShift: 2 + exp. + s := 4. + mPlus := 2 * (mMinus := 1 bitShift: exp)]] + ifFalse: + [(exp = MinValLogBase2 or: [significand ~= 16r10000000000000]) + ifTrue: + [r := significand bitShift: 1. + s := 1 bitShift: 1 - exp. + mPlus := mMinus := 1] + ifFalse: + [r := significand bitShift: 2. + s := 1 bitShift: 2 - exp. + mPlus := 2. + mMinus := 1]]. + delta := s / 2 / (base raisedTo: placesDesired). + roundingLowIncludesLimits := (mMinus < delta and: [mMinus := delta. true]) or: [significand even]. + roundingHighIncludesLimits := (mPlus < delta and: [mPlus := delta. true]) or: [significand even]. + baseExpEstimate := (self exponent * base asFloat reciprocalLogBase2 - 1.0e-10) ceiling. + baseExpEstimate >= 0 + ifTrue: [s := s * (base raisedToInteger: baseExpEstimate)] + ifFalse: + [scale := base raisedToInteger: baseExpEstimate negated. + r := r * scale. + mPlus := mPlus * scale. + mMinus := mMinus * scale]. + ((r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]]) + ifTrue: [baseExpEstimate := baseExpEstimate + 1] + ifFalse: + [r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base]. + decPointCount := baseExpEstimate. + baseExpEstimate <= 0 + ifTrue: + [placesDesired + baseExpEstimate <= 0 + ifTrue: + [aStream nextPut: $0. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]. + ^self]. + aStream nextPutAll: '0.'; nextPutAll: (String new: 0 - baseExpEstimate withAll: $0)]. + slowbit := 1 - s lowBit . + shead := s bitShift: slowbit. + [d := (r bitShift: slowbit) // shead. + r := r - (d * s). + (tc1 := (r <= mMinus) and: [roundingLowIncludesLimits or: [r < mMinus]]) | + (tc2 := (r + mPlus >= s) and: [roundingHighIncludesLimits or: [r + mPlus > s]])] whileFalse: + [aStream nextPut: (Character digitValue: d). + r := r * base. + mPlus := mPlus * base. + mMinus := mMinus * base. + (decPointCount := decPointCount - 1) = 0 ifTrue: [aStream nextPut: $.]]. + tc2 ifTrue: + [(tc1 not or: [r * 2 >= s]) ifTrue: [d := d + 1]]. + aStream nextPut: (Character digitValue: d). + decPointCount > 0 + ifTrue: + [decPointCount - 1 to: 1 by: -1 do: [:i | aStream nextPut: $0]. + (showtrailingZeros and: [placesDesired > 0]) ifTrue: [aStream nextPut: $.; nextPutAll: (String new: placesDesired withAll: $0)]] + ifFalse: + [(showtrailingZeros and: [placesDesired + decPointCount > 1]) ifTrue: [aStream nextPutAll: (String new: placesDesired + decPointCount - 1 withAll: $0)]].! Item was changed: + ----- Method: Float>>absPrintOn:base:digitCount: (in category 'printing') ----- - ----- Method: Float>>absPrintOn:base:digitCount: (in category 'private') ----- absPrintOn: aStream base: base digitCount: digitCount "Print me in the given base, using digitCount significant figures." | fuzz x exp q fBase scale logScale xi | self isInfinite ifTrue: [^ aStream nextPutAll: 'Inf']. fBase := base asFloat. "x is myself normalized to [1.0, fBase), exp is my exponent" exp := self < 1.0 ifTrue: [self reciprocalFloorLog: fBase] ifFalse: [self floorLog: fBase]. scale := 1.0. logScale := 0. [(x := fBase raisedTo: (exp + logScale)) = 0] whileTrue: [scale := scale * fBase. logScale := logScale + 1]. x := self * scale / x. fuzz := fBase raisedTo: 1 - digitCount. "round the last digit to be printed" x := 0.5 * fuzz + x. x >= fBase ifTrue: ["check if rounding has unnormalized x" x := x / fBase. exp := exp + 1]. (exp < 6 and: [exp > -4]) ifTrue: ["decimal notation" q := 0. exp < 0 ifTrue: [1 to: 1 - exp do: [:i | aStream nextPut: ('0.0000' at: i)]]] ifFalse: ["scientific notation" q := exp. exp := 0]. [x >= fuzz] whileTrue: ["use fuzz to track significance" xi := x asInteger. aStream nextPut: (Character digitValue: xi). x := x - xi asFloat * fBase. fuzz := fuzz * fBase. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. [exp >= -1] whileTrue: [aStream nextPut: $0. exp := exp - 1. exp = -1 ifTrue: [aStream nextPut: $.]]. q ~= 0 ifTrue: [aStream nextPut: $e. q printOn: aStream]! Item was added: + ----- Method: Float>>printOn:maxDecimalPlaces: (in category 'printing') ----- + printOn: aStream maxDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: false]]! Item was added: + ----- Method: Float>>printOn:showingDecimalPlaces: (in category 'printing') ----- + printOn: aStream showingDecimalPlaces: placesDesired + "Refine super implementation in order to avoid any rounding error caused by rounded or roundTo:" + + self isFinite ifFalse: [^self printOn: aStream]. + self > 0.0 + ifTrue: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true] + ifFalse: + [self sign = -1 + ifTrue: [aStream nextPutAll: '-']. + self = 0.0 + ifTrue: [aStream nextPutAll: '0.0'] + ifFalse: [self absPrintExactlyOn: aStream base: 10 decimalPlaces: placesDesired showTrailingFractionalZeros: true]]! Item was removed: - ----- Method: Float>>printShowingDecimalPlaces: (in category 'printing') ----- - printShowingDecimalPlaces: placesDesired - "This implementation avoids any rounding error caused by rounded or roundTo:" - - self isFinite ifFalse: [^self printString]. - ^self asTrueFraction printShowingDecimalPlaces: placesDesired!
1
0
0
0
The Trunk: Kernel-eem.690.mcz
by commits@source.squeak.org
20 May '12
20 May '12
Eliot Miranda uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-eem.690.mcz
==================== Summary ==================== Name: Kernel-eem.690 Author: eem Time: 20 May 2012, 11:45:51.817 am UUID: 86741d23-9dcd-4c36-b86e-99d260c22445 Ancestors: Kernel-nice.689 Add Integer>hex8. Arguablty this should be an extension in VMMaker, but since hex isn't, this isn't either (historical). Refactor CompiledMethodTrailer to allow subclasses to instantiate classes other than CompiledMethod. Add CompiledMethod>referredInstVars =============== Diff against Kernel-nice.689 =============== Item was added: + ----- Method: CompiledMethod>>referredInstVars (in category 'accessing') ----- + referredInstVars + "Answer a Set of the inst var names the receiver accesses." + | allInstVarNames instVarNames | + allInstVarNames := self methodClass allInstVarNames. + self isReturnField ifTrue: + [^Set with: (allInstVarNames at: self returnField + 1)]. + instVarNames := Set new. + self abstractBytecodeMessagesDo: + [:msg| + (#(#popIntoReceiverVariable: + #pushReceiverVariable: + #storeIntoReceiverVariable:) includes: msg selector) ifTrue: + [instVarNames add: (allInstVarNames at: msg argument + 1)]]. + ^instVarNames + + "Dictionary newFromPairs: (Point selectors collect: [:s| { s. (Point >> s) referredInstVars}])"! Item was added: + ----- Method: CompiledMethodTrailer>>compiledMethodClass (in category 'creating a method') ----- + compiledMethodClass + "Allow subclasses to create instyances of classes other than CompiledMethod." + + ^CompiledMethod! Item was changed: ----- Method: CompiledMethodTrailer>>createMethod:header: (in category 'creating a method') ----- createMethod: numberOfBytesForAllButTrailer header: headerWord | meth | + encodedData ifNil: [ self encode ]. + "without >>self compiledMethodClass<<, subclassing CompiledMethod is duplicating code" + meth := self compiledMethodClass newMethod: numberOfBytesForAllButTrailer + size header: headerWord. - meth := CompiledMethod newMethod: numberOfBytesForAllButTrailer + size header: headerWord. "copy the encoded trailer data" 1 to: size do: [:i | meth at: meth size - size + i put: (encodedData at: i)]. ^ meth! Item was added: + ----- Method: Integer>>hex8 (in category 'printing') ----- + hex8 + "Print the receiver in base 16 with prefixed base, using at least 8 digits. + DO NOT CHANGE THIS!! The Cog VMMaker depends on this. + Consider using storeStringBase: 16 length: 11 padded: true instead." + "16r3333 hex8" + | hex | + hex := self hex. "16rNNN" + ^hex size < 11 + ifTrue: [hex copyReplaceFrom: 4 to: 3 + with: ('00000000' copyFrom: 1 to: 11-hex size)] + ifFalse: [hex]!
1
0
0
0
The Trunk: Kernel-eem.690.mcz
by commits@source.squeak.org
20 May '12
20 May '12
Eliot Miranda uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-eem.690.mcz
==================== Summary ==================== Name: Kernel-eem.690 Author: eem Time: 20 May 2012, 11:45:51.817 am UUID: 86741d23-9dcd-4c36-b86e-99d260c22445 Ancestors: Kernel-nice.689 Add Integer>hex8. Arguablty this should be an extension in VMMaker, but since hex isn't, this isn't either (historical). Refactor CompiledMethodTrailer to allow subclasses to instantiate classes other than CompiledMethod. Add CompiledMethod>referredInstVars =============== Diff against Kernel-nice.689 =============== Item was added: + ----- Method: CompiledMethod>>referredInstVars (in category 'accessing') ----- + referredInstVars + "Answer a Set of the inst var names the receiver accesses." + | allInstVarNames instVarNames | + allInstVarNames := self methodClass allInstVarNames. + self isReturnField ifTrue: + [^Set with: (allInstVarNames at: self returnField + 1)]. + instVarNames := Set new. + self abstractBytecodeMessagesDo: + [:msg| + (#(#popIntoReceiverVariable: + #pushReceiverVariable: + #storeIntoReceiverVariable:) includes: msg selector) ifTrue: + [instVarNames add: (allInstVarNames at: msg argument + 1)]]. + ^instVarNames + + "Dictionary newFromPairs: (Point selectors collect: [:s| { s. (Point >> s) referredInstVars}])"! Item was added: + ----- Method: CompiledMethodTrailer>>compiledMethodClass (in category 'creating a method') ----- + compiledMethodClass + "Allow subclasses to create instyances of classes other than CompiledMethod." + + ^CompiledMethod! Item was changed: ----- Method: CompiledMethodTrailer>>createMethod:header: (in category 'creating a method') ----- createMethod: numberOfBytesForAllButTrailer header: headerWord | meth | + encodedData ifNil: [ self encode ]. + "without >>self compiledMethodClass<<, subclassing CompiledMethod is duplicating code" + meth := self compiledMethodClass newMethod: numberOfBytesForAllButTrailer + size header: headerWord. - meth := CompiledMethod newMethod: numberOfBytesForAllButTrailer + size header: headerWord. "copy the encoded trailer data" 1 to: size do: [:i | meth at: meth size - size + i put: (encodedData at: i)]. ^ meth! Item was added: + ----- Method: Integer>>hex8 (in category 'printing') ----- + hex8 + "Print the receiver in base 16 with prefixed base, using at least 8 digits. + DO NOT CHANGE THIS!! The Cog VMMaker depends on this. + Consider using storeStringBase: 16 length: 11 padded: true instead." + "16r3333 hex8" + | hex | + hex := self hex. "16rNNN" + ^hex size < 11 + ifTrue: [hex copyReplaceFrom: 4 to: 3 + with: ('00000000' copyFrom: 1 to: 11-hex size)] + ifFalse: [hex]!
1
0
0
0
← Newer
1
2
3
4
5
6
7
8
...
14
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
Results per page:
10
25
50
100
200