Actually set the framework to .NET 4.6 and correct namespace behaviour

iraqigeek · Dec 15, 2015 · 1df8ca6 · 1df8ca6
1 parent 77d64d8
commit 1df8ca6
Show file tree

Hide file tree

Showing 14 changed files with 77 additions and 80 deletions.
diff --git a/RoaringBitmap.Benchmark/MicroBenchmarks/MicroBenchmark.cs b/RoaringBitmap.Benchmark/MicroBenchmarks/MicroBenchmark.cs
@@ -6,7 +6,7 @@ namespace RoaringBitmap.Benchmark.MicroBenchmarks
 {
     public abstract class MicroBenchmark
     {
-        private readonly RoaringBitmap[] m_Bitmaps;
+        private readonly Collections.Special.RoaringBitmap[] m_Bitmaps;
 
         protected MicroBenchmark(string fileName)
         {
@@ -57,7 +57,7 @@ public int AndNot()
             var total = 0;
             for (var k = 0; k < m_Bitmaps.Length - 1; k++)
             {
-                total += RoaringBitmap.AndNot(m_Bitmaps[k], m_Bitmaps[k + 1]).Cardinality;
+                total += Collections.Special.RoaringBitmap.AndNot(m_Bitmaps[k], m_Bitmaps[k + 1]).Cardinality;
             }
             return total;
         }

diff --git a/RoaringBitmap.Benchmark/ZipRealDataProvider.cs b/RoaringBitmap.Benchmark/ZipRealDataProvider.cs
@@ -7,7 +7,7 @@
 
 namespace RoaringBitmap.Benchmark
 {
-    public class ZipRealDataProvider : IEnumerable<RoaringBitmap>, IDisposable
+    public class ZipRealDataProvider : IEnumerable<Collections.Special.RoaringBitmap>, IDisposable
     {
         private readonly ZipArchive m_Archive;
 
@@ -23,7 +23,7 @@ public void Dispose()
             GC.SuppressFinalize(this);
         }
 
-        public IEnumerator<RoaringBitmap> GetEnumerator()
+        public IEnumerator<Collections.Special.RoaringBitmap> GetEnumerator()
         {
             foreach (var zipArchiveEntry in m_Archive.Entries)
             {
@@ -33,7 +33,7 @@ public IEnumerator<RoaringBitmap> GetEnumerator()
                     {
                         var split = stringReader.ReadLine().Split(',');
                         var values = split.Select(int.Parse).ToList();
-                        yield return RoaringBitmap.Create(values);
+                        yield return Collections.Special.RoaringBitmap.Create(values);
                     }
                 }
             }

diff --git a/RoaringBitmap.Tests/BenchmarkTests.cs b/RoaringBitmap.Tests/BenchmarkTests.cs
@@ -170,7 +170,7 @@ public void AndNot(string name, int value)
             var total = 0;
             for (var k = 0; k < bitmaps.Length - 1; k++)
             {
-                total += RoaringBitmap.AndNot(bitmaps[k], bitmaps[k + 1]).Cardinality;
+                total += Collections.Special.RoaringBitmap.AndNot(bitmaps[k], bitmaps[k + 1]).Cardinality;
             }
             Assert.Equal(value, total);
         }
@@ -196,9 +196,9 @@ public void SerializeDeserialize(string name)
             {
                 using (var ms = new MemoryStream())
                 {
-                    RoaringBitmap.Serialize(roaringBitmap, ms);
+                    Collections.Special.RoaringBitmap.Serialize(roaringBitmap, ms);
                     ms.Position = 0;
-                    var rb2 = RoaringBitmap.Deserialize(ms);
+                    var rb2 = Collections.Special.RoaringBitmap.Deserialize(ms);
                     Assert.Equal(roaringBitmap, rb2);
                 }
             }
@@ -207,12 +207,12 @@ public void SerializeDeserialize(string name)
 
         public class BenchmarkTestsFixture
         {
-            private readonly Dictionary<string, RoaringBitmap[]> m_BitmapDictionary = new Dictionary<string, RoaringBitmap[]>();
+            private readonly Dictionary<string, Collections.Special.RoaringBitmap[]> m_BitmapDictionary = new Dictionary<string, Collections.Special.RoaringBitmap[]>();
             private readonly string m_Path = @"Data";
 
-            public RoaringBitmap[] GetBitmaps(string name)
+            public Collections.Special.RoaringBitmap[] GetBitmaps(string name)
             {
-                RoaringBitmap[] bitmaps;
+                Collections.Special.RoaringBitmap[] bitmaps;
                 if (!m_BitmapDictionary.TryGetValue(name, out bitmaps))
                 {
                     using (var provider = new ZipRealDataProvider(Path.Combine(m_Path, name)))