From 98939dfccbdec1952a3fbd4dd449b0fc704de0e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Legat?= <benoit.legat@gmail.com>
Date: Thu, 3 Sep 2020 23:46:00 +0200
Subject: [PATCH 1/2] Implement get for CleverDict

---
 src/Utilities/CleverDicts.jl  | 12 +++++++++++-
 test/Utilities/CleverDicts.jl |  4 ++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Utilities/CleverDicts.jl b/src/Utilities/CleverDicts.jl
index 32f8a7412b..c1a4d16dc0 100644
--- a/src/Utilities/CleverDicts.jl
+++ b/src/Utilities/CleverDicts.jl
@@ -26,7 +26,7 @@ Provided no keys are deleted, the backing storage is a `Vector{V}`. Once a key
 has been deleted, the backing storage switches to an `OrderedDict{K, V}`.
 
 Use the `add_item` to enforce adding item in sequence. Once an object is added
-out of order `add_item` does not work anymore and the storage is switched to 
+out of order `add_item` does not work anymore and the storage is switched to
 `OrderedDict{K, V}` if it is not one already.
 
 The i'th ordered element can be obtained with `c[LinearIndex(i)]`.
@@ -149,6 +149,16 @@ function Base.haskey(c::CleverDict{K}, key::K) where K
         return Base.haskey(c.dict, key)
     end
 end
+function Base.get(c::CleverDict, key, default)
+    if _is_dense(c)
+        if !haskey(c, key)
+            return default
+        end
+        return c.vector[c.hash(key)::Int64]
+    else
+        return get(c.dict, key, default)
+    end
+end
 function Base.getindex(c::CleverDict, key)
     if _is_dense(c)
         if !haskey(c, key)
diff --git a/test/Utilities/CleverDicts.jl b/test/Utilities/CleverDicts.jl
index 80dedccbed..50a5579470 100644
--- a/test/Utilities/CleverDicts.jl
+++ b/test/Utilities/CleverDicts.jl
@@ -20,6 +20,10 @@ CleverDicts.index_to_key(::Type{MyKey}, index::Int) = MyKey{index}()
         d = CleverDicts.CleverDict{MathOptInterface.VariableIndex, String}()
         key = CleverDicts.add_item(d, "first")
         @test key == MathOptInterface.VariableIndex(1)
+        @test get(d, key, nothing) == "first"
+        @test get(d, MathOptInterface.VariableIndex(2), nothing) === nothing
+        @test Dict(key => "first") == d
+        @test Dict(key => "second") != d
         sizehint!(d, 1)
         @test d[key] == "first"
         @test haskey(d, key) == true

From 2563b6fec47e3cd3fdb0e10d16cba75b881d91f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Legat?= <benoit.legat@gmail.com>
Date: Fri, 4 Sep 2020 09:08:23 +0200
Subject: [PATCH 2/2] Add tests when `is_dense` is `true`

---
 test/Utilities/CleverDicts.jl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/Utilities/CleverDicts.jl b/test/Utilities/CleverDicts.jl
index 50a5579470..72f3119fc7 100644
--- a/test/Utilities/CleverDicts.jl
+++ b/test/Utilities/CleverDicts.jl
@@ -39,6 +39,10 @@ CleverDicts.index_to_key(::Type{MyKey}, index::Int) = MyKey{index}()
         @test d[key2] == "second"
         d[key2] = "third"
         @test d[key2] == "third"
+        @test get(d, key, nothing) === nothing
+        @test get(d, key2, nothing) === "third"
+        @test Dict(key2 => "second") != d
+        @test Dict(key2 => "third") == d
 
         empty!(d)