Fix histogram resampling output bin positions

[alexxy/gromacs.git] / src / gromacs / analysisdata / tests / refdata / AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml

diff --git a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
index b0566f10d0a633f62b89d31bd9cef1cc7b68bc45..02a3193019123f5813a276a0bf72d85b7b8dd3d5 100644 (file)
--- a/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
+++ b/src/gromacs/analysisdata/tests/refdata/AbstractAverageHistogramTest_ResamplesAtDoubleBinWidth.xml
@@ -1,87 +1,108 @@
 <?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="referencedata.xsl"?>
 <ReferenceData>
-  <Compound Name="InputData" Subtype="AnalysisData">
-    <Compound Name="Frame0" Subtype="DataFrame">
-      <Real Name="X">1.000000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>2.000000</Real>
-        <Real>1.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame1" Subtype="DataFrame">
-      <Real Name="X">1.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>1.000000</Real>
-        <Real>1.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame2" Subtype="DataFrame">
-      <Real Name="X">2.000000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>3.000000</Real>
-        <Real>2.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame3" Subtype="DataFrame">
-      <Real Name="X">2.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>4.000000</Real>
-        <Real>2.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame4" Subtype="DataFrame">
-      <Real Name="X">3.000000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>2.000000</Real>
-        <Real>1.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame5" Subtype="DataFrame">
-      <Real Name="X">3.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>0.000000</Real>
-        <Real>3.000000</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame6" Subtype="DataFrame">
-      <Real Name="X">4.000000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>1.000000</Real>
-        <Real>3.000000</Real>
-      </Compound>
-    </Compound>
-  </Compound>
-  <Compound Name="ResampledHistogram" Subtype="AnalysisData">
-    <Compound Name="Frame0" Subtype="DataFrame">
-      <Real Name="X">1.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>3.000000</Real>
-        <Real>1.414214</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame1" Subtype="DataFrame">
-      <Real Name="X">2.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>7.000000</Real>
-        <Real>2.828427</Real>
-      </Compound>
-    </Compound>
-    <Compound Name="Frame2" Subtype="DataFrame">
-      <Real Name="X">3.500000</Real>
-      <Compound Name="Y" Subtype="SequenceReal">
-        <Int Name="Length">2</Int>
-        <Real>2.000000</Real>
-        <Real>3.162278</Real>
-      </Compound>
-    </Compound>
-  </Compound>
+  <AnalysisData Name="InputData">
+    <DataFrame Name="Frame0">
+      <Real Name="X">1</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">1</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame1">
+      <Real Name="X">1.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">1</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame2">
+      <Real Name="X">2</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">3</Real>
+          <Real Name="Error">2</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame3">
+      <Real Name="X">2.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">4</Real>
+          <Real Name="Error">2</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame4">
+      <Real Name="X">3</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">1</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame5">
+      <Real Name="X">3.5</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">0</Real>
+          <Real Name="Error">3</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame6">
+      <Real Name="X">4</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">1</Real>
+          <Real Name="Error">3</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+  </AnalysisData>
+  <AnalysisData Name="ResampledHistogram">
+    <DataFrame Name="Frame0">
+      <Real Name="X">1.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">3</Real>
+          <Real Name="Error">1.4142135623730951</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame1">
+      <Real Name="X">2.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">7</Real>
+          <Real Name="Error">2.8284271247461903</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+    <DataFrame Name="Frame2">
+      <Real Name="X">3.25</Real>
+      <DataValues>
+        <Int Name="Count">1</Int>
+        <DataValue>
+          <Real Name="Value">2</Real>
+          <Real Name="Error">3.1622776601683795</Real>
+        </DataValue>
+      </DataValues>
+    </DataFrame>
+  </AnalysisData>
 </ReferenceData>