From bcae594b3f0ea3a78180db9a8393e57412f1260f Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Thu, 17 Dec 2015 09:31:41 +0100
Subject: [PATCH] WaterMeterResults -> Results, etc.

---
 Config/ResultItemSpec.cs                      |   9 +
 Results/Entities/MeterTestResult.cs           |  67 -------
 Results/Entities/TestResult.cs                | 167 ------------------
 .../Entities}/WaterMeterResult.cs             |   2 +-
 Results/Mappings/MeterTestResultMap.cs        |  29 ---
 Results/Mappings/TestResultMap.cs             | 109 ------------
 Results/Results.csproj                        |  10 +-
 ResultsBrowser/DataDeposit.cs                 |  16 +-
 ResultsBrowser/MainWnd.cs                     |   2 +-
 ResultsBrowser/ResultsBrowser.csproj          |   5 +-
 .../BenchControl/DB/SensusOracle/Database.cs  |   2 +-
 .../GenericDevices/IResultsWriter.cs          |   5 +-
 .../ResultsWriters/Basic/Writer.cs            |   2 +-
 .../BenchControl/Sequences/MainSeq.cs         |   2 +-
 TestBenchFramework/TBF.csproj                 |   6 +-
 15 files changed, 39 insertions(+), 394 deletions(-)
 delete mode 100644 Results/Entities/MeterTestResult.cs
 delete mode 100644 Results/Entities/TestResult.cs
 rename {ResultsBrowser => Results/Entities}/WaterMeterResult.cs (99%)
 delete mode 100644 Results/Mappings/MeterTestResultMap.cs
 delete mode 100644 Results/Mappings/TestResultMap.cs

diff --git a/Config/ResultItemSpec.cs b/Config/ResultItemSpec.cs
index eb8f0ae6c..c0d76fd11 100644
--- a/Config/ResultItemSpec.cs
+++ b/Config/ResultItemSpec.cs
@@ -76,12 +76,19 @@ namespace Config
 			AllItems = new List<ResultItemSpec>();
 
 			/// Common
+		
+			//AllItems.Add(new ResultItemSpec("Bench ID", "Bench ID", x => x.TestResult.BenchID,
+			//                                                   (x, y, z) => x.TestResult.BenchID));
 			AllItems.Add(new ResultItemSpec("Test name", "Test", x => x.TestResult.TestName,
 															   (x, y, z) => x.TestResult.TestName));
 			AllItems.Add(new ResultItemSpec("Procedure name", "Procedure", x => x.TestResult.ProcedureName,
 																	     (x, y, z) => x.TestResult.ProcedureName));
 			AllItems.Add(new ResultItemSpec("Batch number", "Batch nr.", x => x.TestResult.BatchNr.ToString(),
 																	  (x, y, z) => x.TestResult.BatchNr.ToString()));
+			AllItems.Add(new ResultItemSpec("Test method", "Test method", x => x.TestResult.Method,
+																	  (x, y, z) => x.TestResult.Method));
+			AllItems.Add(new ResultItemSpec("Density", "Density", x => x.TestResult.DensityOut.ToString("F1"),
+																	  (x, y, z) => x.TestResult.DensityOut.ToString("F1")));	/// [kg/m3]
 
 			/// Target values
 			AllItems.Add(new ResultItemSpec("Q from", "Q from [l/h]", x => x.TestResult.Qfrom.ToString("F3"),
@@ -96,6 +103,8 @@ namespace Config
 																	  (x, y, z) => x.TestResult.ErrLimHi.ToString("F1")));
 			AllItems.Add(new ResultItemSpec("Error limit sum", "Err.Lim.Sum [%]", x => (x.TestResult.ErrLimHi - x.TestResult.ErrLimLo).ToString("F1"),
 																	  (x, y, z) => (x.TestResult.ErrLimHi - x.TestResult.ErrLimLo).ToString("F1")));
+			AllItems.Add(new ResultItemSpec("Uncertainty", "Uncertainty [%]", x => x.TestResult.Uncertainty.ToString("F2"),
+																	  (x, y, z) => x.TestResult.Uncertainty.ToString("F2")));
 
 			/// Test results
 			AllItems.Add(new ResultItemSpec("Start time", "T start", x => x.TestResult.TimeStart.ToShortTimeString(),
diff --git a/Results/Entities/MeterTestResult.cs b/Results/Entities/MeterTestResult.cs
deleted file mode 100644
index 9b3c2e1eb..000000000
--- a/Results/Entities/MeterTestResult.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-
-namespace Results.Entities
-{
-    public class MeterTestResult
-    {
-        public virtual int Id { get; protected set; }
-        public virtual TestResult TestResult { get; set; }      /// reference to the TestResult entity
-
-		public virtual bool Disabled { get; set; }				/// true = this meter was disabled and the results should be disregarded
-		public virtual string SerialNr { get; set; }
-        public virtual string EndState { get; set; }
-        public virtual float VolumeStart { get; set; }          /// liter
-        public virtual float VolumeEnd { get; set; }            /// liter
-        public virtual float VolumeMeter { get; set; }          /// liter
-        public virtual float VolumeRef { get; set; }            /// liter
-        public virtual float VolumeErrorPct { get; set; }       /// %
-        public virtual float PulsesMeter { get; set; }			/// # of pulses
-        public virtual float PulsesPerLiter { get; set; }		/// Pulses per liter
-        public virtual float PulsesMaster { get; set; }
-        public virtual float Time { get; set; }                 /// sec.
-		public virtual float TimeStart { get; set; }            /// sec. - Not mapped to DB !!!
-		public virtual float TimeEnd { get; set; }              /// sec. - Not mapped to DB !!!
-		public virtual int CalibFactor { get; set; }			/// iPerl calibration factor used during the test - Not mapped to DB !!!
-		public virtual double Q2Correction { get; set; }			/// iPerl Q2 correction used during the test - Not mapped to DB !!!
-		public virtual bool Passed { get; set; }				/// true=test passed - Not mapped to DB !!!															
-
-        public MeterTestResult()
-        {
-            PulsesPerLiter = 1.0f;
-        }
-
-        public MeterTestResult(TestResult testResult)
-            : this()
-        {
-            TestResult = testResult;
-        }
-
-        public virtual MeterTestResult Clone(TestResult testResult)
-        {
-            MeterTestResult result = new MeterTestResult(testResult);
-
-			result.Disabled = Disabled;
-			result.SerialNr = SerialNr;
-            result.EndState = EndState;
-            result.VolumeStart = VolumeStart;
-            result.VolumeEnd = VolumeEnd;
-            result.VolumeMeter = VolumeMeter;
-            result.VolumeRef = VolumeRef;
-            result.VolumeErrorPct = VolumeErrorPct;
-            result.PulsesMeter = PulsesMeter;
-            result.PulsesPerLiter = PulsesPerLiter;
-            result.PulsesMaster = PulsesMaster;
-            result.Time = Time;
-			result.TimeStart = TimeStart;
-			result.TimeEnd = TimeEnd;
-			result.CalibFactor = CalibFactor;
-			result.Q2Correction = Q2Correction;
-			result.Passed = Passed;
-
-            return result;
-        }
-    }
-}
diff --git a/Results/Entities/TestResult.cs b/Results/Entities/TestResult.cs
deleted file mode 100644
index 40759e1df..000000000
--- a/Results/Entities/TestResult.cs
+++ /dev/null
@@ -1,167 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using System;
-using System.Collections.Generic;
-using Config.Entities;
-
-namespace Results.Entities
-{
-    public class TestResult
-    {
-        public virtual int Id { get; protected set; }
-		public virtual string Name { get; set; }
-		public virtual int BatchNr { get; set; }
-		public virtual string PurchaseOrder { get; set; }
-		public virtual MetersKind MetersKind { get; set; }
-		public virtual IList<MeterTestResult> Meters { get; set; }
-		public virtual IList<MeterTestResult> CombinedMeters { get; set; }
-
-        /// Value copied from the procedure (Entities.Procedure)
-        public virtual string ProcedureName { get; set; }
-		public virtual string ProtocolTitle { get; set; }
-
-		/// Values copied from the test (Entities.Test)
-        public virtual int TestId { get; set; }				/// Test entity ID to distinguish between tests with the same name
-		public virtual string TestName { get; set; }
-		public virtual int Part { get; set; }
-		public virtual bool DoNotEvaluate { get; set; }		///        Not mapped to the database
-		public virtual bool DoNotPublish { get; set; }		///        Not mapped to the database
-		public virtual float Qfrom { get; set; }			/// [m3/h] Water flow low limit
-		public virtual float Qto { get; set; }				/// [m3/h] Water flow high limit
-		public virtual float Volume { get; set; }			/// [l]    Target test volume
-		public virtual float TstTime { get; set; }			/// [s]    Test time estimate
-		public virtual int Repeats { get; set; }
-		public virtual bool Emptying { get; set; }
-		public virtual bool Zeroing { get; set; }
-		public virtual float PumpPower { get; set; }		/// Power of the pump in [%] in the range 0 .. 100.0f, use values 0% and 100% for non-FM pumps
-		public virtual int Time2MassMsrmt { get; set; }
-		public virtual string Method { get; set; }
-		public virtual float ErrLimLo { get; set; }			/// [%]    Lower error limit (usually < 0)
-		public virtual float ErrLimHi { get; set; }			/// [%]    Upper error limit (usually > 0)
-		public virtual float Uncertainty { get; set; }		///	[%]    Makes error limits tighter: 0 <= Uncertainty <= abs(ErrLimXx)
-		
-		/// To be replaced by the virtual bench component parameters
-		public virtual string FeedingPath { get; set; }
-		public virtual string BenchPath { get; set; }
-		public virtual string OutputPath { get; set; }
-		public virtual string MetersPath { get; set; }
-
-		/// Results
-		public virtual DateTime TimeStart { get; set; }     ///         Date and time of the test start
-		public virtual DateTime TimeEnd { get; set; }       ///         Date and time of the test end
-		public virtual int RepetitionNr { get; set; }       ///         Repetition number from the set of repeated tests (1...)
-		public virtual float AmbientTempAve { get; set; }   /// [deg.C] Average ambient air temperature
-        public virtual float AmbientPressAve { get; set; }  ///         Average ambient air pressure
-		public virtual float AmbientHumiAve { get; set; }   /// [%]     Average ambient air relative humidity
-		public virtual float PressInAvrg { get; set; }      /// [Bar]   Input water pressure (average)
-		public virtual float PressInStart { get; set; }     /// [Bar]
-		public virtual float PressInEnd { get; set; }       /// [Bar]
-		public virtual float PressOutAvrg { get; set; }     /// [Bar]
-		public virtual float PressOutStart { get; set; }    /// [Bar]
-		public virtual float PressOutEnd { get; set; }      /// [Bar]
-		public virtual float TempInAvrg { get; set; }		/// [deg.C]
-		public virtual float TempInStart { get; set; }		/// [deg.C]
-		public virtual float TempInEnd { get; set; }		/// [deg.C]
-		public virtual float TempOutAvrg { get; set; }		/// [deg.C]
-		public virtual float TempOutStart { get; set; }		/// [deg.C]
-		public virtual float TempOutEnd { get; set; }		/// [deg.C]
-		public virtual float TempDivAvrg { get; set; }		/// [deg.C]
-		public virtual float TempDivStart { get; set; }		/// [deg.C]
-		public virtual float TempDivEnd { get; set; }		/// [deg.C]
-		public virtual float MassStartRaw { get; set; }		/// [kg]
-		public virtual float MassStart { get; set; }		/// [kg]
-		public virtual float MassEndRaw { get; set; }		/// [kg]
-		public virtual float MassEnd { get; set; }			/// [kg]
-		public virtual float MassDiff { get; set; }			/// [kg]
-		public virtual float DensityIn { get; set; }		/// [kg/m3]
-		public virtual float DensityOut { get; set; }		/// [kg/m3]
-		public virtual float DensityDiv { get; set; }		/// [kg/m3]
-		public virtual float Buoyancy { get; set; }												///TODO -> map
-		public virtual float FlowMass { get; set; }         /// [kg/h]  calculated from conventional true value
-		public virtual float FlowVolume { get; set; }       /// [l/h]   calculated from conventional true value
-        public virtual float VolumeCTV { get; set; }        /// [l]     Volume conventional true value
-        public virtual float VolumeMaster { get; set; }     /// [l]     Volume from the master flow meter
-        public virtual float Time { get; set; }             /// [s]     Measurement time in seconds
-        public virtual float ErrorMaster { get; set; }		/// [%]
-        public virtual float PulsesMaster { get; set; }
-        public virtual float ConstMaster { get; set; }      /// [pls/l] Pulses per liter master flow meter
-		public virtual float QRise { get; set; }			///         Detected Q_rise of a composed meter
-		public virtual float QFall { get; set; }			///         Detected Q_fall of a composed meter
-		public virtual float TimeDivStart0 { get; set; }
-        public virtual float TimeDivStart1 { get; set; }
-        public virtual float TimeDivStart2 { get; set; }
-        public virtual float TimeDivStart3 { get; set; }
-        public virtual float TimeDivStart4 { get; set; }
-        public virtual float TimeDivStart5 { get; set; }
-        public virtual float TimeDivEnd0 { get; set; }
-        public virtual float TimeDivEnd1 { get; set; }
-        public virtual float TimeDivEnd2 { get; set; }
-        public virtual float TimeDivEnd3 { get; set; }
-        public virtual float TimeDivEnd4 { get; set; }
-        public virtual float TimeDivEnd5 { get; set; }
-
-		public TestResult()
-		{
-			Meters = new List<MeterTestResult>();
-			CombinedMeters = new List<MeterTestResult>();
-		}
-        
-		public TestResult(MetersKind kind)
-			: this()
-        {
-			MetersKind = kind;
-
-			if (kind == MetersKind.Single)
-			{
-				for (int i = 0; i < Config.Data.WMsCount; i++) Meters.Add(new MeterTestResult(this));
-			}
-			else if (kind == MetersKind.Combined)
-			{
-				for (int i = 0; i < 2 * Config.Data.CompoundWMsCount; i++) Meters.Add(new MeterTestResult(this));
-				for (int i = 0; i < Config.Data.CompoundWMsCount; i++) CombinedMeters.Add(new MeterTestResult(this));
-			}
-		}
-
-		public TestResult(Test test, int repetitionNr, MetersKind kind)
-			: this(kind)
-        {
-			if (test.Repeats == 1)
-			{
-                Name = test.Name;
-			}
-			else
-			{
-				Name = string.Format("{0} ({1}/{2})", test.Name, repetitionNr, test.Repeats);
-			}
-			RepetitionNr = repetitionNr;
-
-            /// Copy test parameters from Entities.Procedure object
-            ProcedureName = test.Procedure.Name;
-			ProtocolTitle = test.Procedure.ProtocolTitle;
-
-			/// Copy test parameters from Entities.Test object
-            TestId = test.Id;
-			TestName = test.Name;
-			Part = test.Part;
-			Qfrom = test.Qfrom;
-			Qto = test.Qto;
-			Volume = test.Volume;
-			TstTime = test.TstTime;
-			Repeats = test.Repeats;
-			Emptying = test.Emptying;
-			Zeroing = test.Zeroing;
-			PumpPower = PumpPower;
-			Time2MassMsrmt = test.TimeStop2Mass;
-			Method = test.Method;
-			ErrLimLo = test.ErrLimLo;
-			ErrLimHi = test.ErrLimHi;
-			Uncertainty = test.Uncertainty;
-
-			FeedingPath = test.FeedingPath;
-			BenchPath = test.BenchPath;
-			OutputPath = test.OutputPath;
-			MetersPath = test.MetersPath;
-		}
-    }
-}
diff --git a/ResultsBrowser/WaterMeterResult.cs b/Results/Entities/WaterMeterResult.cs
similarity index 99%
rename from ResultsBrowser/WaterMeterResult.cs
rename to Results/Entities/WaterMeterResult.cs
index 2c5e21158..5870fd306 100644
--- a/ResultsBrowser/WaterMeterResult.cs
+++ b/Results/Entities/WaterMeterResult.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using Config.Entities;
 
-namespace ResultsBrowser
+namespace Results.Entities
 {
 	public class WaterMeterResult
 	{
diff --git a/Results/Mappings/MeterTestResultMap.cs b/Results/Mappings/MeterTestResultMap.cs
deleted file mode 100644
index 3b80fbaa6..000000000
--- a/Results/Mappings/MeterTestResultMap.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using FluentNHibernate.Mapping;
-using Results.Entities;
-
-namespace Results.Mappings
-{
-	class MeterTestResultMap : ClassMap<MeterTestResult>
-    {
-        public MeterTestResultMap()
-        {
-            Id(x => x.Id);
-            References(x => x.TestResult);
-			Map(x => x.Disabled);
-			Map(x => x.SerialNr);
-            Map(x => x.EndState);
-            Map(x => x.VolumeStart);
-            Map(x => x.VolumeEnd);
-            Map(x => x.VolumeMeter);
-            Map(x => x.VolumeRef);
-            Map(x => x.VolumeErrorPct);
-            Map(x => x.PulsesMeter);
-            Map(x => x.PulsesPerLiter);
-            Map(x => x.PulsesMaster);
-            Map(x => x.Time);
-        }
-    }
-}
diff --git a/Results/Mappings/TestResultMap.cs b/Results/Mappings/TestResultMap.cs
deleted file mode 100644
index 4597cb7a7..000000000
--- a/Results/Mappings/TestResultMap.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-///
-/// Copyright (c) 2013-2015 Sensus Metering Systems
-///
-using FluentNHibernate.Mapping;
-using Results.Entities;
-
-namespace Results.Mappings
-{
-	class TestResultMap : ClassMap<TestResult>
-    {
-        public TestResultMap()
-        {
-            Id(x => x.Id);
-			Map(x => x.Name);
-			Map(x => x.BatchNr);
-			Map(x => x.PurchaseOrder);
-			Map(x => x.MetersKind);
-            HasMany(x => x.Meters)
-                .Cascade.All();
-			HasMany(x => x.CombinedMeters)
-				.Cascade.All();
-
-            Map(x => x.ProcedureName);
-			Map(x => x.ProtocolTitle);
-
-            Map(x => x.TestId);
-            Map(x => x.TestName);
-			Map(x => x.Part);
-			Map(x => x.Qfrom);
-			Map(x => x.Qto);
-			Map(x => x.Volume);
-			Map(x => x.TstTime);
-			Map(x => x.Repeats);
-			Map(x => x.Emptying);
-			Map(x => x.Zeroing);
-			Map(x => x.PumpPower);
-			Map(x => x.Time2MassMsrmt);
-            Map(x => x.Method);
-			Map(x => x.ErrLimLo);
-			Map(x => x.ErrLimHi);
-			Map(x => x.Uncertainty);
-
-			Map(x => x.FeedingPath)
-                .CustomType("StringClob")
-                .CustomSqlType("varchar(4000)");
-			Map(x => x.BenchPath)
-                .CustomType("StringClob")
-                .CustomSqlType("varchar(4000)");
-			Map(x => x.OutputPath)
-                .CustomType("StringClob")
-                .CustomSqlType("varchar(4000)");
-			Map(x => x.MetersPath)
-                .CustomType("StringClob")
-                .CustomSqlType("varchar(4000)");
-
-            Map(x => x.TimeStart);
-            Map(x => x.TimeEnd);
-		    Map(x => x.RepetitionNr);
-			Map(x => x.AmbientTempAve);
-            Map(x => x.AmbientPressAve);
-            Map(x => x.AmbientHumiAve);
-            Map(x => x.PressInAvrg);
-            Map(x => x.PressInStart);
-		    Map(x => x.PressInEnd);
-            Map(x => x.PressOutAvrg);
-            Map(x => x.PressOutStart);
-		    Map(x => x.PressOutEnd);
-            Map(x => x.TempInAvrg);
-		    Map(x => x.TempInStart);
-		    Map(x => x.TempInEnd);
-		    Map(x => x.TempOutAvrg);
-		    Map(x => x.TempOutStart);
-		    Map(x => x.TempOutEnd);
-		    Map(x => x.TempDivAvrg);
-		    Map(x => x.TempDivStart);
-		    Map(x => x.TempDivEnd);
-            Map(x => x.MassStartRaw);
-            Map(x => x.MassStart);
-            Map(x => x.MassEndRaw);
-            Map(x => x.MassEnd);
-            Map(x => x.MassDiff);
-            Map(x => x.DensityIn);
-            Map(x => x.DensityOut);
-            Map(x => x.DensityDiv);
-            Map(x => x.FlowMass);         /// from conventional true value
-            Map(x => x.FlowVolume);       /// from conventional true value
-            Map(x => x.VolumeCTV);        /// volume conventional true value
-            Map(x => x.VolumeMaster);     /// volume from the master flow meter
-            Map(x => x.Time);             /// measurement time in seconds
-            Map(x => x.ErrorMaster);
-            Map(x => x.PulsesMaster);
-            Map(x => x.ConstMaster);      /// Pulses per liter master flow meter
-			Map(x => x.QRise);
-			Map(x => x.QFall);
-            Map(x => x.TimeDivStart0);
-            Map(x => x.TimeDivStart1);
-            Map(x => x.TimeDivStart2);
-            Map(x => x.TimeDivStart3);
-            Map(x => x.TimeDivStart4);
-            Map(x => x.TimeDivStart5);
-            Map(x => x.TimeDivEnd0);
-            Map(x => x.TimeDivEnd1);
-            Map(x => x.TimeDivEnd2);
-            Map(x => x.TimeDivEnd3);
-            Map(x => x.TimeDivEnd4);
-            Map(x => x.TimeDivEnd5);
-        }
-    }
-}
diff --git a/Results/Results.csproj b/Results/Results.csproj
index 8b6ff167f..75aad9438 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -54,10 +54,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Class1.cs" />
-    <Compile Include="Entities\MeterTestResult.cs" />
-    <Compile Include="Entities\TestResult.cs" />
-    <Compile Include="Mappings\MeterTestResultMap.cs" />
-    <Compile Include="Mappings\TestResultMap.cs" />
+    <Compile Include="Entities\WaterMeterResult.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -66,6 +63,11 @@
       <Name>Config</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FileWriters\" />
+    <Folder Include="Mappings\" />
+    <Folder Include="Printers\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ResultsBrowser/DataDeposit.cs b/ResultsBrowser/DataDeposit.cs
index 315a4f2cb..e31f80eff 100644
--- a/ResultsBrowser/DataDeposit.cs
+++ b/ResultsBrowser/DataDeposit.cs
@@ -13,10 +13,10 @@ namespace ResultsBrowser
 	public static class DataDeposit
 	{
 		public static IList<TestResult> ReportTestResults;
-		public static IList<WaterMeterResult> ReportWaterMeterResults;
+		public static IList<Results.Entities.WaterMeterResult> ReportWaterMeterResults;
 
 		public static IList<TestResult> QueryTestResults;
-		public static IList<WaterMeterResult> QueryWaterMeterResults;
+		public static IList<Results.Entities.WaterMeterResult> QueryWaterMeterResults;
 
 		static DataDeposit()
 		{
@@ -26,10 +26,10 @@ namespace ResultsBrowser
 		public static void Clear()
 		{
 			ReportTestResults = new List<TestResult>();
-			ReportWaterMeterResults = new List<WaterMeterResult>();
+			ReportWaterMeterResults = new List<Results.Entities.WaterMeterResult>();
 
 			QueryTestResults = new List<TestResult>();
-			QueryWaterMeterResults = new List<WaterMeterResult>();
+			QueryWaterMeterResults = new List<Results.Entities.WaterMeterResult>();
 		}
 
 		public static void ProcessQueryTestResults(IList<TestResult> testResults, bool resolveManually)
@@ -60,7 +60,7 @@ namespace ResultsBrowser
 			///
 			foreach (var batchNr in batchNrs)
 			{
-				IList<WaterMeterResult> wmResults = new List<WaterMeterResult>();
+				IList<Results.Entities.WaterMeterResult> wmResults = new List<Results.Entities.WaterMeterResult>();
 				bool waterMetersCreated = false;
 
 				foreach (var tr in selectedTestResults)
@@ -69,7 +69,7 @@ namespace ResultsBrowser
 					{
 						if (!waterMetersCreated)
 						{
-							foreach (var mtr in tr.Meters) wmResults.Add(new WaterMeterResult(mtr, 5));
+							foreach (var mtr in tr.Meters) wmResults.Add(new Results.Entities.WaterMeterResult(mtr, 5));
 							waterMetersCreated = true;
 						}
 						else
@@ -97,11 +97,11 @@ namespace ResultsBrowser
 			foreach (var tr in selectedTestResults) QueryTestResults.Add(tr);
 		}
 
-		public static void AddWMResultsAvoidDuplicates(IList<WaterMeterResult> wmResults, bool resolveManually)
+		public static void AddWMResultsAvoidDuplicates(IList<Results.Entities.WaterMeterResult> wmResults, bool resolveManually)
 		{
 			foreach (var wmr in wmResults)
 			{
-				WaterMeterResult foundWM = null;
+				Results.Entities.WaterMeterResult foundWM = null;
 
 				foreach (var wm in QueryWaterMeterResults)
 				{
diff --git a/ResultsBrowser/MainWnd.cs b/ResultsBrowser/MainWnd.cs
index 227fe67fb..224b594a6 100644
--- a/ResultsBrowser/MainWnd.cs
+++ b/ResultsBrowser/MainWnd.cs
@@ -264,7 +264,7 @@ namespace ResultsBrowser
 
                     for (int j = i; j < Math.Min(j + Step, DataDeposit.ReportWaterMeterResults.Count); j++)
                     {
-                        WaterMeterResult wm = DataDeposit.ReportWaterMeterResults[j];
+                        Results.Entities.WaterMeterResult wm = DataDeposit.ReportWaterMeterResults[j];
 
                         IList<int> serialNrExes = new List<int>();
                         {
diff --git a/ResultsBrowser/ResultsBrowser.csproj b/ResultsBrowser/ResultsBrowser.csproj
index fab78d90e..b4332eefa 100644
--- a/ResultsBrowser/ResultsBrowser.csproj
+++ b/ResultsBrowser/ResultsBrowser.csproj
@@ -120,7 +120,6 @@
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\Strings.Designer.cs" />
-    <Compile Include="WaterMeterResult.cs" />
     <EmbeddedResource Include="BenchesDlg.resx">
       <DependentUpon>BenchesDlg.cs</DependentUpon>
     </EmbeddedResource>
@@ -169,6 +168,10 @@
       <Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
       <Name>Config</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Results\Results.csproj">
+      <Project>{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}</Project>
+      <Name>Results</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
index 1c4e621ab..98e427e5e 100644
--- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
+++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
@@ -181,7 +181,7 @@ namespace TBF.BenchControl.DB.SensusOracle
 		/// <param name="procedure">Procedure to print the results of</param>
 		/// <param name="unsortedResults">Results to write into the file</param>
 		/// <returns>Reference to the operation</returns>
-        public IOperation WriteResultsOp(Procedure procedure, IList<GenericDevices.IWaterMeter> waterMeters, IList<TestResult> unsortedResults)
+		public IOperation WriteResultsOp(string TestBenchId, Procedure procedure, IList<GenericDevices.IWaterMeter> waterMeters, IList<TestResult> unsortedResults)
 		{
 			if ((procedure == null) || (unsortedResults == null) || (unsortedResults.Count < 1))
 			{
diff --git a/TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs b/TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs
index 25e9dbbc8..9030df132 100644
--- a/TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs
+++ b/TestBenchFramework/BenchControl/GenericDevices/IResultsWriter.cs
@@ -14,6 +14,9 @@ namespace TBF.BenchControl.GenericDevices
 		/// </summary>
 		/// <param name="results">Results to write into a file</param>
 		/// <returns>Reference to the operation</returns>
-        IOperation WriteResultsOp(Procedure procedure, IList<IWaterMeter> waterMeters, IList<TestResult> results);
+		IOperation WriteResultsOp(string TestBenchId,
+								  Procedure procedure,
+								  IList<IWaterMeter> waterMeters,
+								  IList<TestResult> results);
 	}
 }
diff --git a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
index 910c16977..7eab96853 100644
--- a/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+++ b/TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
@@ -137,7 +137,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
 		/// <param name="procedure">Procedure to print the results of</param>
 		/// <param name="unsortedResults">Results to write into the file</param>
 		/// <returns>Reference to the operation</returns>
-        public IOperation WriteResultsOp(Procedure procedure, IList<GenericDevices.IWaterMeter> waterMeters, IList<TestResult> unsortedResults)
+		public IOperation WriteResultsOp(string testBenchId, Procedure procedure, IList<GenericDevices.IWaterMeter> waterMeters, IList<TestResult> unsortedResults)
 		{
 			if ((procedure == null) || (unsortedResults == null) || (unsortedResults.Count < 1))
 			{
diff --git a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
index 9ad56d653..158ecb361 100644
--- a/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
+++ b/TestBenchFramework/BenchControl/Sequences/MainSeq.cs
@@ -618,7 +618,7 @@ namespace TBF.BenchControl.Sequences
 			State savingAndPrintingRslts = State.Create("MainSeq : Saving and printing results");
 			if (writer != null)
 			{
-                savingAndPrintingRslts.AddOperation(writer.WriteResultsOp(StateMachine.Procedure, WaterMeters, results));
+				savingAndPrintingRslts.AddOperation(writer.WriteResultsOp(BenchInfo.TestBenchId, StateMachine.Procedure, WaterMeters, results));
 			}
 			if (printer != null && !printer.SupressPrinting)
 			{
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 0a6f9083d..255793675 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -52,13 +52,13 @@
     <DefineConstants>TRACE;MUNICH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -66,7 +66,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;MUNICH</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>