Skip to content

FSharp.Core: Map: fix tracing #10191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cartermp merged 1 commit into from
Sep 27, 2020
Merged

FSharp.Core: Map: fix tracing #10191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/fsharp/FSharp.Core/map.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ module MapTree =
(totalSizeOnMapLookup / float numLookups))
System.Console.WriteLine("#largestMapSize = {0}, largestMapStackTrace = {1}", largestMapSize, largestMapStackTrace)

let MapOne n =
let MapTree n =
report()
numOnes <- numOnes + 1
totalSizeOnNodeCreation <- totalSizeOnNodeCreation + 1.0
MapTree n

let MapNode (x, l, v, r, h) =
let MapTreeNode (x, l, v, r, h) =
report()
numNodes <- numNodes + 1
let n = MapTreeNode (x, l, v, r, h)
Expand All @@ -87,10 +87,13 @@ module MapTree =
| :? MapTreeNode<'Key, 'Value> as mn -> mn.Height
| _ -> 1

[<Literal>]
let tolerance = 2

let mk l k v r : MapTree<'Key, 'Value> =
let hl = height l
let hr = height r
let m = max hl hr
let m = if hl < hr then hr else hl
if m = 0 then // m=0 ~ isEmpty l && isEmpty r
MapTree(k,v)
else
Expand All @@ -102,7 +105,7 @@ module MapTree =
let rebalance t1 (k: 'Key) (v: 'Value) t2 : MapTree<'Key, 'Value> =
let t1h = height t1
let t2h = height t2
if t2h > t1h + 2 then (* right is heavier than left *)
if t2h > t1h + tolerance then (* right is heavier than left *)
let t2' = asNode(t2)
(* one of the nodes must have height > height t1 + 1 *)
if height t2'.Left > t1h + 1 then (* balance left: combination *)
Expand All @@ -111,7 +114,7 @@ module MapTree =
else (* rotate left *)
mk (mk t1 k v t2'.Left) t2'.Key t2'.Value t2'.Right
else
if t1h > t2h + 2 then (* left is heavier than right *)
if t1h > t2h + tolerance then (* left is heavier than right *)
let t1' = asNode(t1)
(* one of the nodes must have height > height t2 + 1 *)
if height t1'.Right > t2h + 1 then
Expand Down Expand Up @@ -461,7 +464,7 @@ module MapTree =
let current i =
if i.started then
match i.stack with
| [] -> alreadyFinished()
| [] -> alreadyFinished()
| m :: _ ->
match m with
| :? MapTreeNode<'Key, 'Value> -> failwith "Please report error: Map iterator, unexpected stack for current"
Expand Down