Cleanup commit as requested

manofstick · Feb 7, 2014 · e082374 · e082374
2 parents 3884b19 + 82d8d20
commit e082374
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 28 deletions.
diff --git a/SimpleSpeedTester.sln b/SimpleSpeedTester.sln
@@ -1,8 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30110.0
-MinimumVisualStudioVersion = 10.0.40219.1
+# Visual Studio 2012
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{E8ED0C5C-C3B1-4A75-B4F6-7933657B347F}"
 	ProjectSection(SolutionItems) = preProject
 		.nuget\NuGet.Config = .nuget\NuGet.Config
@@ -29,10 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F8
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleSpeedTester.Example", "examples\SimpleSpeedTester.Example\SimpleSpeedTester.Example.csproj", "{7ADA7026-5757-4E93-AC72-D7E69DC08433}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{8FCC7912-0E7B-4520-9BAA-30443A57DD61}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "fastJSON", "lib\fastJSON v1.9.6\fastJSON\fastJSON.csproj", "{207E91B1-C9F8-4913-88E1-3549EF5F3273}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinarySerializersBenchmark", "examples\BinarySerializersBenchmark\BinarySerializersBenchmark.csproj", "{564AA4F6-333F-41D2-B924-A07B3D449BDC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonSerializersBenchmark", "examples\JsonSerializersBenchmark\JsonSerializersBenchmark.csproj", "{65E36753-C531-417C-AA59-B99D10E68EE3}"
@@ -81,16 +75,6 @@ Global
 		{7ADA7026-5757-4E93-AC72-D7E69DC08433}.Release|Mixed Platforms.Build.0 = Release|x86
 		{7ADA7026-5757-4E93-AC72-D7E69DC08433}.Release|x86.ActiveCfg = Release|x86
 		{7ADA7026-5757-4E93-AC72-D7E69DC08433}.Release|x86.Build.0 = Release|x86
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Release|Any CPU.Build.0 = Release|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273}.Release|x86.ActiveCfg = Release|Any CPU
 		{564AA4F6-333F-41D2-B924-A07B3D449BDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{564AA4F6-333F-41D2-B924-A07B3D449BDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{564AA4F6-333F-41D2-B924-A07B3D449BDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -141,7 +125,5 @@ Global
 		{564AA4F6-333F-41D2-B924-A07B3D449BDC} = {F891B8A3-232F-4736-9CF7-1C1D2BDCB6F8}
 		{65E36753-C531-417C-AA59-B99D10E68EE3} = {F891B8A3-232F-4736-9CF7-1C1D2BDCB6F8}
 		{94F57EB2-21B7-42B3-A885-B2DE5EE74A10} = {F891B8A3-232F-4736-9CF7-1C1D2BDCB6F8}
-		{088C6FFB-7156-4172-96D8-32111C602067} = {F891B8A3-232F-4736-9CF7-1C1D2BDCB6F8}
-		{207E91B1-C9F8-4913-88E1-3549EF5F3273} = {8FCC7912-0E7B-4520-9BAA-30443A57DD61}
 	EndGlobalSection
 EndGlobal
diff --git a/examples/BinarySerializersBenchmark/BinarySerializersSpeedTest.cs b/examples/BinarySerializersBenchmark/BinarySerializersSpeedTest.cs
@@ -69,13 +69,9 @@ public static Dictionary<string, Tuple<ITestResultSummary, ITestResultSummary, d
                 "BinaryWriter",
                 DoSpeedTest("BinaryWriter", SimpleObjects, SerializeWithBinaryWriter, DeserializeWithBinaryReader));
 
-            results.Add(
-                "FsPickler (Simple Objects)",
-                DoSpeedTest("FsPickler", SimpleObjects, SerializeWithFsPickler, DeserializeWithFsPickler));
-
             results.Add(
                 "FsPickler (Simple Records)",
-                DoSpeedTest("FsPickler", SimpleObjects, SerializeWithFsPickler, DeserializeWithFsPickler));
+                DoSpeedTest("FsPickler", SimpleRecords, SerializeWithFsPickler, DeserializeWithFsPickler<TestRecords.SimpleRecord>));
 
             results.Add(
                 "MessagePack (with properties)",
@@ -112,7 +108,7 @@ public static Dictionary<string, Tuple<ITestResultSummary, ITestResultSummary, d
             return results;
         }
 
-        private static List<SimpleObject> DeserializeWithFsPickler(List<byte[]> payloads)
+        private static List<T> DeserializeWithFsPickler<T>(List<byte[]> payloads)
         {
             var fsp = new FsPickler.FsPickler();
 
@@ -121,12 +117,12 @@ private static List<SimpleObject> DeserializeWithFsPickler(List<byte[]> payloads
                 {
                     using (var ms = new MemoryStream(payload))
                     {
-                        return fsp.Deserialize<SimpleObject>(ms);
+                        return fsp.Deserialize<T>(ms);
                     }
                 }).ToList();
         }
 
-        private static List<byte[]> SerializeWithFsPickler(List<SimpleObject> objects)
+        private static List<byte[]> SerializeWithFsPickler<T>(List<T> objects)
         {
             var fsp = new FsPickler.FsPickler();
 

diff --git a/examples/JsonSerializersBenchmark/packages.config b/examples/JsonSerializersBenchmark/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="fastJSON" version="2.0.27.1" targetFramework="net45" />
+  <package id="fastJSON" version="2.0.27.1" targetFramework="net40" />
   <package id="jayrock-json" version="0.9.16530" targetFramework="net45" />
   <package id="Jil" version="1.0.1" targetFramework="net45" />
   <package id="JsonFx" version="2.0.1209.2802" targetFramework="net45" />