Remove superfluous selection names from refdata.

Now that there are proper tests for handling the selection names,
removed the testing of the name from most other tests, since the name
was always identical to the selection text.

Part of #651.

Change-Id: I3844031f94336c9934d79fec711920eed04cea4a

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndCharges.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndCharges.xml
index 63feebf7c9c83ff424ed48cb902104eb9176cd19..bb21453cedb7992a9396c03975a03b9df02bccd5 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndCharges.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndCharges.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name CB</String>
-      <String Name="Name">name CB</String>
       <String Name="Text">name CB</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">y &gt; 2</String>
-      <String Name="Name">y &gt; 2</String>
       <String Name="Text">y &gt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">res_cog of y &gt; 2</String>
-      <String Name="Name">res_cog of y &gt; 2</String>
       <String Name="Text">res_cog of y &gt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndChargesWithoutTopology.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndChargesWithoutTopology.xml
index f8380a2128b3becfcbb09cf4a164279bf9cef8fe..6e1871c19e90da64db1eab9c76d8e702f34e07eb 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndChargesWithoutTopology.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_ComputesMassesAndChargesWithoutTopology.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 3 8 to 9</String>
-      <String Name="Name">atomnr 1 to 3 8 to 9</String>
       <String Name="Text">atomnr 1 to 3 8 to 9</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">y &gt; 2</String>
-      <String Name="Name">y &gt; 2</String>
       <String Name="Text">y &gt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">cog of (y &gt; 2)</String>
-      <String Name="Name">cog of (y &gt; 2)</String>
       <String Name="Text">cog of (y &gt; 2)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAllNone.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAllNone.xml
index 23b96ddac76ce595774d00515158c359d3b5329a..262279ec52cff60545dcca5797bb8f96976495fd 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAllNone.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAllNone.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">all</String>
-      <String Name="Name">all</String>
       <String Name="Text">all</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">none</String>
-      <String Name="Name">none</String>
       <String Name="Text">none</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAltLoc.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAltLoc.xml
index f95763c81b93f6dc530fdd3e47275512af1e7fe7..ead707ebb2a28beccdd2fc6da590cfef43b4a5d3 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAltLoc.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAltLoc.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">altloc " "</String>
-      <String Name="Name">altloc " "</String>
       <String Name="Text">altloc " "</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">altloc A</String>
-      <String Name="Name">altloc A</String>
       <String Name="Text">altloc A</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesArithmeticExpressions.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesArithmeticExpressions.xml
index a2c3be1da8cbf43944a09b2149e7b0909fef7ce0..186ebb6307db247d5e7dc239d37bb78bcff9ef1b 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesArithmeticExpressions.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesArithmeticExpressions.xml
@@ -4,25 +4,21 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">x+1 &gt; 3</String>
-      <String Name="Name">x+1 &gt; 3</String>
       <String Name="Text">x+1 &gt; 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">(y-1)^2 &lt;= 1</String>
-      <String Name="Name">(y-1)^2 &lt;= 1</String>
       <String Name="Text">(y-1)^2 &lt;= 1</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">x+--1 &gt; 3</String>
-      <String Name="Name">x+--1 &gt; 3</String>
       <String Name="Text">x+--1 &gt; 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">-x+-1 &lt; -3</String>
-      <String Name="Name">-x+-1 &lt; -3</String>
       <String Name="Text">-x+-1 &lt; -3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomname.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomname.xml
index 85a8d625c0d60e0c26814f27909a76b146f134a7..2db05aff253948554d52a981e0a0edbf20b95d44 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomname.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomname.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name CB</String>
-      <String Name="Name">name CB</String>
       <String Name="Text">name CB</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomname S1 S2</String>
-      <String Name="Name">atomname S1 S2</String>
       <String Name="Text">atomname S1 S2</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomnr.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomnr.xml
index d04eeae488dc009ac69dcddd7d66b0ddf094593d..d0af612a0e3a4aa605390346380c23ca20f20aa4 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomnr.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomnr.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 3 6 to 8</String>
-      <String Name="Name">atomnr 1 to 3 6 to 8</String>
       <String Name="Text">atomnr 1 to 3 6 to 8</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 4 2 5 to 7</String>
-      <String Name="Name">atomnr 4 2 5 to 7</String>
       <String Name="Text">atomnr 4 2 5 to 7</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">atomnr &lt;= 5</String>
-      <String Name="Name">atomnr &lt;= 5</String>
       <String Name="Text">atomnr &lt;= 5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomtype.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomtype.xml
index 77c46a368a94e8e7bb190ceeefc670ca6e7a0930..93aa131fddfc215983011b2ab5498e0aaa160655 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomtype.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesAtomtype.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomtype CA</String>
-      <String Name="Name">atomtype CA</String>
       <String Name="Text">atomtype CA</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBasicBoolean.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBasicBoolean.xml
index 0e4a3eff0ee09b2b8c2721a7169cde3dc0f94ca8..54a51087ff0531dff900c5559f6104f9feb4a05a 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBasicBoolean.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBasicBoolean.xml
@@ -4,31 +4,26 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 5 and atomnr 2 to 7</String>
-      <String Name="Name">atomnr 1 to 5 and atomnr 2 to 7</String>
       <String Name="Text">atomnr 1 to 5 and atomnr 2 to 7</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 1 to 5 or not atomnr 3 to 8</String>
-      <String Name="Name">atomnr 1 to 5 or not atomnr 3 to 8</String>
       <String Name="Text">atomnr 1 to 5 or not atomnr 3 to 8</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">not not atomnr 1 to 5 and atomnr 2 to 6 and not not atomnr 3 to 7</String>
-      <String Name="Name">not not atomnr 1 to 5 and atomnr 2 to 6 and not not atomnr 3 to 7</String>
       <String Name="Text">not not atomnr 1 to 5 and atomnr 2 to 6 and not not atomnr 3 to 7</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">atomnr 1 to 5 and (atomnr 2 to 7 and atomnr 3 to 6)</String>
-      <String Name="Name">atomnr 1 to 5 and (atomnr 2 to 7 and atomnr 3 to 6)</String>
       <String Name="Text">atomnr 1 to 5 and (atomnr 2 to 7 and atomnr 3 to 6)</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection5">
       <String Name="Input">x &lt; 5 and atomnr 1 to 5 and y &lt; 3 and atomnr 2 to 4</String>
-      <String Name="Name">x &lt; 5 and atomnr 1 to 5 and y &lt; 3 and atomnr 2 to 4</String>
       <String Name="Text">x &lt; 5 and atomnr 1 to 5 and y &lt; 3 and atomnr 2 to 4</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBeta.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBeta.xml
index ea7d01d4d4c0412240965291a11cbfa0606c035d..a03266b272c1b9884040c03f86e65cd73d7c28db 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBeta.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBeta.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">beta 0</String>
-      <String Name="Name">betafactor 0</String>
       <String Name="Text">betafactor 0</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">beta &gt;= 0.3</String>
-      <String Name="Name">betafactor &gt;= 0.3</String>
       <String Name="Text">betafactor &gt;= 0.3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysis.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysis.xml
index 97cd37f815242dc18c048637eea46fccce52d7e4..8c95d044c7ea937b292e4624fa5e2a6e782a3826 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysis.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysis.xml
@@ -4,31 +4,26 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 5 and atomnr 2 to 7 and x &lt; 2</String>
-      <String Name="Name">atomnr 1 to 5 and atomnr 2 to 7 and x &lt; 2</String>
       <String Name="Text">atomnr 1 to 5 and atomnr 2 to 7 and x &lt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 1 to 5 and (atomnr 4 to 7 or x &lt; 2)</String>
-      <String Name="Name">atomnr 1 to 5 and (atomnr 4 to 7 or x &lt; 2)</String>
       <String Name="Text">atomnr 1 to 5 and (atomnr 4 to 7 or x &lt; 2)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">atomnr 1 to 5 and y &lt; 3 and (atomnr 4 to 7 or x &lt; 2)</String>
-      <String Name="Name">atomnr 1 to 5 and y &lt; 3 and (atomnr 4 to 7 or x &lt; 2)</String>
       <String Name="Text">atomnr 1 to 5 and y &lt; 3 and (atomnr 4 to 7 or x &lt; 2)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">atomnr 1 to 5 and not (atomnr 4 to 7 or x &lt; 2)</String>
-      <String Name="Name">atomnr 1 to 5 and not (atomnr 4 to 7 or x &lt; 2)</String>
       <String Name="Text">atomnr 1 to 5 and not (atomnr 4 to 7 or x &lt; 2)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection5">
       <String Name="Input">atomnr 1 to 5 or (atomnr 4 to 6 and (atomnr 5 to 7 or x &lt; 2))</String>
-      <String Name="Name">atomnr 1 to 5 or (atomnr 4 to 6 and (atomnr 5 to 7 or x &lt; 2))</String>
       <String Name="Text">atomnr 1 to 5 or (atomnr 4 to 6 and (atomnr 5 to 7 or x &lt; 2))</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithMoreVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithMoreVariables.xml
index fe31e659edb98d88caff23da51c33a4df89948ad..41a489fc997d77a564d6c2c69dc442246ce6abcc 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithMoreVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithMoreVariables.xml
@@ -13,19 +13,16 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 4 and bar</String>
-      <String Name="Name">atomnr 1 to 4 and bar</String>
       <String Name="Text">atomnr 1 to 4 and bar</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 2 to 6 and y &lt; 3 and bar2</String>
-      <String Name="Name">atomnr 2 to 6 and y &lt; 3 and bar2</String>
       <String Name="Text">atomnr 2 to 6 and y &lt; 3 and bar2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">atomnr 6 to 10 and not foo</String>
-      <String Name="Name">atomnr 6 to 10 and not foo</String>
       <String Name="Text">atomnr 6 to 10 and not foo</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithVariables.xml
index 826b5234cfef591e0219e5e040271220466b1323..3e9002ec2c111bc2389e7420af8c25c03bc3264d 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesBooleanStaticAnalysisWithVariables.xml
@@ -7,19 +7,16 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 4 and foo</String>
-      <String Name="Name">atomnr 1 to 4 and foo</String>
       <String Name="Text">atomnr 1 to 4 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 2 to 6 and y &lt; 3 and foo</String>
-      <String Name="Name">atomnr 2 to 6 and y &lt; 3 and foo</String>
       <String Name="Text">atomnr 2 to 6 and y &lt; 3 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">atomnr 6 to 10 and not foo</String>
-      <String Name="Name">atomnr 6 to 10 and not foo</String>
       <String Name="Text">atomnr 6 to 10 and not foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesChain.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesChain.xml
index 16dd2873e2b6e352a513c72aa3027970d083b7e3..6b5147fe2bee1151a811ce0ac34a9ab3a276c5e2 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesChain.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesChain.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">chain A</String>
-      <String Name="Name">chain A</String>
       <String Name="Text">chain A</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">chain B</String>
-      <String Name="Name">chain B</String>
       <String Name="Text">chain B</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCharge.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCharge.xml
index 62e2d068b052cbe0398ed1788e28bfc65d837ce0..e10179c949259633688d4e300a2f4d32ee8e6f5e 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCharge.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCharge.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">charge &lt; 0.5</String>
-      <String Name="Name">charge &lt; 0.5</String>
       <String Name="Text">charge &lt; 0.5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesComplexNumericVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesComplexNumericVariables.xml
index e8d7e984951e4ec370eee7e2dd5ca0d9367060fd..b1a2ae558b5192b978c01175c7f27b0cd3b0a0b4 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesComplexNumericVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesComplexNumericVariables.xml
@@ -7,13 +7,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">resname RA and value &lt;= 4</String>
-      <String Name="Name">resname RA and value &lt;= 4</String>
       <String Name="Text">resname RA and value &lt;= 4</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resname RA RB and x &lt; 3 and value &lt;= 4</String>
-      <String Name="Name">resname RA RB and x &lt; 3 and value &lt;= 4</String>
       <String Name="Text">resname RA RB and x &lt; 3 and value &lt;= 4</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
@@ -22,13 +20,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection3">
       <String Name="Input">resname RA and index &lt; 3</String>
-      <String Name="Name">resname RA and index &lt; 3</String>
       <String Name="Text">resname RA and index &lt; 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">resname RB and y &lt; 3 and index &lt; 6</String>
-      <String Name="Name">resname RB and y &lt; 3 and index &lt; 6</String>
       <String Name="Text">resname RB and y &lt; 3 and index &lt; 6</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositionInVariable.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositionInVariable.xml
index 25226defaddf977af5087a050a135fe752585fb0..ddd50c834ce1f54d9f37539455e823c3b40f887b 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositionInVariable.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositionInVariable.xml
@@ -7,13 +7,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">constpos</String>
-      <String Name="Name">constpos</String>
       <String Name="Text">constpos</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">within 2 of constpos</String>
-      <String Name="Name">within 2 of constpos</String>
       <String Name="Text">within 2 of constpos</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositions.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositions.xml
index 6496bb0cdf3e45e0e6926d961f883d44e9f4c3e4..9a8619f01dc3bf85ae690b9081d23524b2f1d040 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositions.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesConstantPositions.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">[1, -2, 3.5]</String>
-      <String Name="Name">[1, -2, 3.5]</String>
       <String Name="Text">[1, -2, 3.5]</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCoordinateKeywords.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCoordinateKeywords.xml
index d65c005cca1eb608a489ef3c4a05c8871fc23ec7..26af6d248b35dc2d553f92cb6b272178ee0b07b7 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCoordinateKeywords.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesCoordinateKeywords.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">x &lt; 3</String>
-      <String Name="Name">x &lt; 3</String>
       <String Name="Text">x &lt; 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">y &gt;= 3</String>
-      <String Name="Name">y &gt;= 3</String>
       <String Name="Text">y &gt;= 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">x {-1 to 2}</String>
-      <String Name="Name">x {-1 to 2}</String>
       <String Name="Text">x {-1 to 2}</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDistanceKeyword.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDistanceKeyword.xml
index 767f3a0c46b3e123a9206dc6f71a7252a16f60be..6283ab97ff557c6af644522e010d559855f2e30c 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDistanceKeyword.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDistanceKeyword.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">distance from cog of resnr 1 &lt; 2</String>
-      <String Name="Name">distance from cog of resnr 1 &lt; 2</String>
       <String Name="Text">distance from cog of resnr 1 &lt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDynamicAtomValuedParameters.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDynamicAtomValuedParameters.xml
index dfce299dd00322e765e5e61d5d56550be0efe29b..4ad99dcb678ea7fd2e82958bf6b61e7c2e343753 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDynamicAtomValuedParameters.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesDynamicAtomValuedParameters.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">same residue as (atomnr 3 5 13 or y &gt; 5)</String>
-      <String Name="Name">same residue as (atomnr 3 5 13 or y &gt; 5)</String>
       <String Name="Text">same residue as (atomnr 3 5 13 or y &gt; 5)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">(resnr 1 3 5 or x &gt; 10) and same residue as (atomnr 3 5 13 or z &gt; 5)</String>
-      <String Name="Name">(resnr 1 3 5 or x &gt; 10) and same residue as (atomnr 3 5 13 or z &gt; 5)</String>
       <String Name="Text">(resnr 1 3 5 or x &gt; 10) and same residue as (atomnr 3 5 13 or z &gt; 5)</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesForcedStringMatchingMode.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesForcedStringMatchingMode.xml
index 96aed6e9fc3c493a92ed60ade7f721c125309307..be2a3aefab3244d385b1c3e426e4bba2c197700d 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesForcedStringMatchingMode.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesForcedStringMatchingMode.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name = S1 "C?"</String>
-      <String Name="Name">name = S1 "C?"</String>
       <String Name="Text">name = S1 "C?"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">name ? S1 "C?"</String>
-      <String Name="Name">name ? S1 "C?"</String>
       <String Name="Text">name ? S1 "C?"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInSolidAngleKeyword.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInSolidAngleKeyword.xml
index 14469a4d4a9e3ad977c94a9e9faebef7e863d03e..cc666aad5b901e2f02201a76e3ae8f2f81a9cef0 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInSolidAngleKeyword.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInSolidAngleKeyword.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">resname TP and not insolidangle center cog of resname C span resname R cutoff 20</String>
-      <String Name="Name">resname TP and not insolidangle center cog of resname C span resname R cutoff 20</String>
       <String Name="Text">resname TP and not insolidangle center cog of resname C span resname R cutoff 20</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resname TN and insolidangle center cog of resname C span resname R cutoff 20</String>
-      <String Name="Name">resname TN and insolidangle center cog of resname C span resname R cutoff 20</String>
       <String Name="Text">resname TN and insolidangle center cog of resname C span resname R cutoff 20</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInsertCode.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInsertCode.xml
index 1f9c9d5e038549be2e603924a61cd2edf3e4c105..02a96c8cc98a85cd849417b57c926e0e1fbfa096 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInsertCode.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesInsertCode.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">insertcode " "</String>
-      <String Name="Name">insertcode " "</String>
       <String Name="Text">insertcode " "</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">insertcode A</String>
-      <String Name="Name">insertcode A</String>
       <String Name="Text">insertcode A</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMass.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMass.xml
index 76b1e464fa12579762e71337357ea41e724fa534..fce3db2485c1fc386b6b108207bcad006286e0da 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMass.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMass.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">mass &gt; 5</String>
-      <String Name="Name">mass &gt; 5</String>
       <String Name="Text">mass &gt; 5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMergeModifier.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMergeModifier.xml
index ebff377a2e54c665ed242a5aca267a477efddfc8..c6d5bddff89b486ee9765ee842bd80b5f5ae7b22 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMergeModifier.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMergeModifier.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name S2 merge name S1</String>
-      <String Name="Name">name S2 merge name S1</String>
       <String Name="Text">name S2 merge name S1</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resnr 1 2 and name S2 merge resnr 1 2 and name S1 merge res_cog of resnr 1 2</String>
-      <String Name="Name">resnr 1 2 and name S2 merge resnr 1 2 and name S1 merge res_cog of resnr 1 2</String>
       <String Name="Text">resnr 1 2 and name S2 merge resnr 1 2 and name S1 merge res_cog of resnr 1 2</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">name S1 and x &lt; 2.5 merge res_cog of x &lt; 2.5</String>
-      <String Name="Name">name S1 and x &lt; 2.5 merge res_cog of x &lt; 2.5</String>
       <String Name="Text">name S1 and x &lt; 2.5 merge res_cog of x &lt; 2.5</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMinDistanceKeyword.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMinDistanceKeyword.xml
index d5319f1c811b557f862fd0b64aa05b64cee0cdfa..b180d475e74364f78dbae29d08c648081b03adb4 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMinDistanceKeyword.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMinDistanceKeyword.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">mindistance from resnr 1 &lt; 2</String>
-      <String Name="Name">mindistance from resnr 1 &lt; 2</String>
       <String Name="Text">mindistance from resnr 1 &lt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMolIndex.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMolIndex.xml
index bd56516605378f62c0d834fbe2fa23721bc3f66e..ab2195e0e988905eb262439f51ddc7582b32e262 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMolIndex.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesMolIndex.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">molindex 1 4</String>
-      <String Name="Name">molindex 1 4</String>
       <String Name="Text">molindex 1 4</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">molecule 2 3 5</String>
-      <String Name="Name">molecule 2 3 5</String>
       <String Name="Text">molecule 2 3 5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericComparisons.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericComparisons.xml
index 6d9a284fdb4d6587df94d246932682a795128920..ab04f31879e65df337df22830f2d0bb1cda67052 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericComparisons.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericComparisons.xml
@@ -4,31 +4,26 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">x &gt; 2</String>
-      <String Name="Name">x &gt; 2</String>
       <String Name="Text">x &gt; 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">2 &lt; x</String>
-      <String Name="Name">2 &lt; x</String>
       <String Name="Text">2 &lt; x</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">y &gt; resnr</String>
-      <String Name="Name">y &gt; resnr</String>
       <String Name="Text">y &gt; resnr</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">resnr &lt; 2.5</String>
-      <String Name="Name">resnr &lt; 2.5</String>
       <String Name="Text">resnr &lt; 2.5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection5">
       <String Name="Input">2.5 &gt; resnr</String>
-      <String Name="Name">2.5 &gt; resnr</String>
       <String Name="Text">2.5 &gt; resnr</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericConstantsInVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericConstantsInVariables.xml
index d37473a225a17f5cff8f64d7e27d76c03311165e..708af07b5486a5b6089ac6963da723b6591fbdb8 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericConstantsInVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericConstantsInVariables.xml
@@ -13,13 +13,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">resnr &lt; constint</String>
-      <String Name="Name">resnr &lt; constint</String>
       <String Name="Text">resnr &lt; constint</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">x + constreal1 &lt; constreal2</String>
-      <String Name="Name">x + constreal1 &lt; constreal2</String>
       <String Name="Text">x + constreal1 &lt; constreal2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericVariables.xml
index 5d9f80f2bede8e9ca3787c09827adbd88a271352..db9d6065806389a691cc6f565a37c94644894230 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesNumericVariables.xml
@@ -7,7 +7,6 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">value &lt;= 4</String>
-      <String Name="Name">value &lt;= 4</String>
       <String Name="Text">value &lt;= 4</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
@@ -16,7 +15,6 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection2">
       <String Name="Input">index &lt; 3</String>
-      <String Name="Name">index &lt; 3</String>
       <String Name="Text">index &lt; 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesOccupancy.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesOccupancy.xml
index 9f0b91b5ed7f042b9d8b300c109a6a20180a0be4..5e463ab94d65e4926c103b5da3da0a6589a9f3cd 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesOccupancy.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesOccupancy.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">occupancy 1</String>
-      <String Name="Name">occupancy 1</String>
       <String Name="Text">occupancy 1</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">occupancy &lt; .5</String>
-      <String Name="Name">occupancy &lt; .5</String>
       <String Name="Text">occupancy &lt; .5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPdbAtomname.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPdbAtomname.xml
index 8bfe632e79371c0a4a779c039669e4b0e59e1c54..a5b49d272b0991eb6189ad1364898fe066791ce9 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPdbAtomname.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPdbAtomname.xml
@@ -4,25 +4,21 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name HG21</String>
-      <String Name="Name">name HG21</String>
       <String Name="Text">name HG21</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">name 1HG2</String>
-      <String Name="Name">name 1HG2</String>
       <String Name="Text">name 1HG2</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">pdbname HG21 CB</String>
-      <String Name="Name">pdbname HG21 CB</String>
       <String Name="Text">pdbname HG21 CB</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">pdbatomname 1HG2</String>
-      <String Name="Name">pdbatomname 1HG2</String>
       <String Name="Text">pdbatomname 1HG2</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPermuteModifier.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPermuteModifier.xml
index 261714b7eb5e17a720f49a57be56ba24703ce446..96e7de97dabb0453738c94bd6d50ada4afa6a993 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPermuteModifier.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPermuteModifier.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">all permute 3 1 2</String>
-      <String Name="Name">all permute 3 1 2</String>
       <String Name="Text">all permute 3 1 2</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">res_cog of resnr 1 to 4 permute 2 1</String>
-      <String Name="Name">res_cog of resnr 1 to 4 permute 2 1</String>
       <String Name="Text">res_cog of resnr 1 to 4 permute 2 1</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">name CB S1 and res_cog x &lt; 3 permute 2 1</String>
-      <String Name="Name">name CB S1 and res_cog x &lt; 3 permute 2 1</String>
       <String Name="Text">name CB S1 and res_cog x &lt; 3 permute 2 1</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPlusModifier.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPlusModifier.xml
index cd4c68f73c13ba8c1c4e518078e1b796f2d28a46..33f9ce241a77ed5200fd7624063d17b98ff6cf65 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPlusModifier.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPlusModifier.xml
@@ -4,19 +4,16 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name S2 plus name S1</String>
-      <String Name="Name">name S2 plus name S1</String>
       <String Name="Text">name S2 plus name S1</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">res_cog of resnr 2 plus res_cog of resnr 1 plus res_cog of resnr 3</String>
-      <String Name="Name">res_cog of resnr 2 plus res_cog of resnr 1 plus res_cog of resnr 3</String>
       <String Name="Text">res_cog of resnr 2 plus res_cog of resnr 1 plus res_cog of resnr 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">name S1 and y &lt; 3 plus res_cog of x &lt; 2.5</String>
-      <String Name="Name">name S1 and y &lt; 3 plus res_cog of x &lt; 2.5</String>
       <String Name="Text">name S1 and y &lt; 3 plus res_cog of x &lt; 2.5</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionKeywords.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionKeywords.xml
index e6fb1a3b1de7bdbbbf6644b0a162ecd1df17ba8e..1b28c44f218f46b4edf392703273e22b161e5099 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionKeywords.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionKeywords.xml
@@ -4,31 +4,26 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">cog of resnr 1 3</String>
-      <String Name="Name">cog of resnr 1 3</String>
       <String Name="Text">cog of resnr 1 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">res_cog of name CB and resnr 1 3</String>
-      <String Name="Name">res_cog of name CB and resnr 1 3</String>
       <String Name="Text">res_cog of name CB and resnr 1 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">whole_res_cog of name CB and resnr 1 3</String>
-      <String Name="Name">whole_res_cog of name CB and resnr 1 3</String>
       <String Name="Text">whole_res_cog of name CB and resnr 1 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">part_res_cog of x &lt; 3</String>
-      <String Name="Name">part_res_cog of x &lt; 3</String>
       <String Name="Text">part_res_cog of x &lt; 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection5">
       <String Name="Input">dyn_res_cog of x &lt; 3</String>
-      <String Name="Name">dyn_res_cog of x &lt; 3</String>
       <String Name="Text">dyn_res_cog of x &lt; 3</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionVariables.xml
index a77d3ea633f1b85842b6fb9bf594212a38848904..683c076c265f345b810aad6d7a26839bb53f4e63 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesPositionVariables.xml
@@ -7,13 +7,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">foo</String>
-      <String Name="Name">foo</String>
       <String Name="Text">foo</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">within 1 of foo</String>
-      <String Name="Name">within 1 of foo</String>
       <String Name="Text">within 1 of foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
@@ -22,13 +20,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection3">
       <String Name="Input">bar</String>
-      <String Name="Name">bar</String>
       <String Name="Text">bar</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection4">
       <String Name="Input">within 1 of bar</String>
-      <String Name="Name">within 1 of bar</String>
       <String Name="Text">within 1 of bar</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesRegexMatching.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesRegexMatching.xml
index ce4d40c5e8518170372d227f0d82afd62ae10173..ca65954321007e72dbd0205317e9f07b172aa5d6 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesRegexMatching.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesRegexMatching.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">resname "R[BD]"</String>
-      <String Name="Name">resname "R[BD]"</String>
       <String Name="Text">resname "R[BD]"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resname ~ "R[BD]"</String>
-      <String Name="Name">resname ~ "R[BD]"</String>
       <String Name="Text">resname ~ "R[BD]"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResIndex.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResIndex.xml
index 5351607e59174b243f8bbb5ab2c333574af81db4..f5a5a0303905368f0e077bae05032de5a1a0fac4 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResIndex.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResIndex.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">resindex 1 4</String>
-      <String Name="Name">resindex 1 4</String>
       <String Name="Text">resindex 1 4</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">residue 1 3</String>
-      <String Name="Name">residue 1 3</String>
       <String Name="Text">residue 1 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResname.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResname.xml
index 723e96aa4669ddce5be0caec68d9339095d89e1b..9721232f7b5a9c91c6856f569567cbc4d9e46a34 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResname.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResname.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">resname RA</String>
-      <String Name="Name">resname RA</String>
       <String Name="Text">resname RA</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resname RB RC</String>
-      <String Name="Name">resname RB RC</String>
       <String Name="Text">resname RB RC</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResnr.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResnr.xml
index d44e6b351275787543846da87548229e87250f0c..7ef039bb79c1a5641289f5a9a642719e55255121 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResnr.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesResnr.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">resnr 1 2 5</String>
-      <String Name="Name">resnr 1 2 5</String>
       <String Name="Text">resnr 1 2 5</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">resid 4 to 3</String>
-      <String Name="Name">resid 4 to 3</String>
       <String Name="Text">resid 4 to 3</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidue.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidue.xml
index 266440711287d5c6db93149656946b974834518c..c065526f163c2bc658edbf531ebee3f7a19e5e60 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidue.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidue.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">same residue as atomnr 1 4 12</String>
-      <String Name="Name">same residue as atomnr 1 4 12</String>
       <String Name="Text">same residue as atomnr 1 4 12</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidueName.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidueName.xml
index 5d398352e15d09387f3951767b3931e2820e61ab..7798e0db9d5fbc8239cacc33b6065560e29a9923 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidueName.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesSameResidueName.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">same resname as atomnr 1 14</String>
-      <String Name="Name">same resname as atomnr 1 14</String>
       <String Name="Text">same resname as atomnr 1 14</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesUnusedVariables.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesUnusedVariables.xml
index 2463037dfe7b1a2703b3bab0aa1a61620c7ea02e..8b8ca0518c039a68b6e2ba4096036ab512a19801 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesUnusedVariables.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesUnusedVariables.xml
@@ -10,7 +10,6 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 6 and foo</String>
-      <String Name="Name">atomnr 1 to 6 and foo</String>
       <String Name="Text">atomnr 1 to 6 and foo</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups.xml
index 598cd21e25feb1771259101e34cfd1a41681be9d..20ae1d36b387c7c345c4fcef9e48c137fd482c11 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups.xml
@@ -7,19 +7,16 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 6 and foo</String>
-      <String Name="Name">atomnr 1 to 6 and foo</String>
       <String Name="Text">atomnr 1 to 6 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">within 1 of foo</String>
-      <String Name="Name">within 1 of foo</String>
       <String Name="Text">within 1 of foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection3">
       <String Name="Input">foo</String>
-      <String Name="Name">foo</String>
       <String Name="Text">foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups2.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups2.xml
index 46be47d1abbb21fd495b2bcbc6a2a3c3cbc2d139..5f7109555edf67ca00a9f720f2f9249830156492 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups2.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithMixedEvaluationGroups2.xml
@@ -7,13 +7,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 5 and y &lt; 10 and foo</String>
-      <String Name="Name">atomnr 1 to 5 and y &lt; 10 and foo</String>
       <String Name="Text">atomnr 1 to 5 and y &lt; 10 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">foo</String>
-      <String Name="Name">foo</String>
       <String Name="Text">foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithStaticEvaluationGroups.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithStaticEvaluationGroups.xml
index 41537e0c6876583d3117292380a73e188970190b..b382cf5d7d2e2120b3bc4f55fbad4cf0617d51f9 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithStaticEvaluationGroups.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesVariablesWithStaticEvaluationGroups.xml
@@ -7,13 +7,11 @@
     </ParsedVariable>
     <ParsedSelection Name="Selection1">
       <String Name="Input">atomnr 1 to 5 and foo</String>
-      <String Name="Name">atomnr 1 to 5 and foo</String>
       <String Name="Text">atomnr 1 to 5 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">atomnr 3 to 7 and foo</String>
-      <String Name="Name">atomnr 3 to 7 and foo</String>
       <String Name="Text">atomnr 3 to 7 and foo</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWildcardMatching.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWildcardMatching.xml
index 9c19c9f0b8c52dcbb24595baaf6333a0a5c4d4d7..8c1ab7af40ea820a586e5d500b8b524becf4983d 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWildcardMatching.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWildcardMatching.xml
@@ -4,13 +4,11 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">name "S?"</String>
-      <String Name="Name">name "S?"</String>
       <String Name="Text">name "S?"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>
     <ParsedSelection Name="Selection2">
       <String Name="Input">name ? "S?"</String>
-      <String Name="Name">name ? "S?"</String>
       <String Name="Text">name ? "S?"</String>
       <Bool Name="Dynamic">false</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinConstantPositions.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinConstantPositions.xml
index 3d621c380a0ebe055519706d4b2fca9a36b25d14..03a24afe2c4d442d0af39ab3704d6c40aa17bb71 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinConstantPositions.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinConstantPositions.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">within 1 of [2, 1, 0]</String>
-      <String Name="Name">within 1 of [2, 1, 0]</String>
       <String Name="Text">within 1 of [2, 1, 0]</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinKeyword.xml b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinKeyword.xml
index 194c56cde0f97a0eead65d38bdeb61555b7ead22..789876618b25d65d21228ac5cc36c4c968a37a3b 100644 (file)
--- a/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinKeyword.xml
+++ b/src/gromacs/selection/tests/refdata/SelectionCollectionDataTest_HandlesWithinKeyword.xml
@@ -4,7 +4,6 @@
   <ParsedSelections Name="Parsed">
     <ParsedSelection Name="Selection1">
       <String Name="Input">within 1 of resnr 2</String>
-      <String Name="Name">within 1 of resnr 2</String>
       <String Name="Text">within 1 of resnr 2</String>
       <Bool Name="Dynamic">true</Bool>
     </ParsedSelection>

diff --git a/src/gromacs/selection/tests/refdata/referencedata.xsl b/src/gromacs/selection/tests/refdata/referencedata.xsl
index f61376e39e5e24a41f93e410c86ee42ea552d9b8..5c4cb5fedf1c08fb920c6c8626a0bb2df8a65e93 100644 (file)
--- a/src/gromacs/selection/tests/refdata/referencedata.xsl
+++ b/src/gromacs/selection/tests/refdata/referencedata.xsl
@@ -153,7 +153,9 @@
         <tr>
             <th/>
             <th>Input</th>
-            <th>Name</th>
+            <xsl:if test="*/String[@Name='Name']">
+                <th>Name</th>
+            </xsl:if>
             <th>Text</th>
             <th>Dynamic</th>
         </tr>
@@ -161,7 +163,9 @@
         <tr>
             <td><xsl:value-of select="@Name"/></td>
             <td><xsl:value-of select="String[@Name='Input']"/></td>
-            <td><xsl:value-of select="String[@Name='Name']"/></td>
+            <xsl:if test="String[@Name='Name']">
+                <td><xsl:value-of select="String[@Name='Name']"/></td>
+            </xsl:if>
             <td><xsl:value-of select="String[@Name='Text']"/></td>
             <td><xsl:value-of select="Bool[@Name='Dynamic']"/></td>
         </tr>

diff --git a/src/gromacs/selection/tests/selectioncollection.cpp b/src/gromacs/selection/tests/selectioncollection.cpp
index 04716ae3d61c10c26efbff065c2ffc3b21311d68..ffa1b914107179885b2edfb20eb1643c18536ab7 100644 (file)
--- a/src/gromacs/selection/tests/selectioncollection.cpp
+++ b/src/gromacs/selection/tests/selectioncollection.cpp
@@ -290,7 +290,10 @@ SelectionCollectionDataTest::runParser(const char *const *selections,
             TestReferenceChecker selcompound(
                     compound.checkCompound("ParsedSelection", id.c_str()));
             selcompound.checkString(selections[i], "Input");
-            selcompound.checkString(sel_[count_].name(), "Name");
+            if (flags_.test(efTestSelectionNames))
+            {
+                selcompound.checkString(sel_[count_].name(), "Name");
+            }
             selcompound.checkString(sel_[count_].selectionText(), "Text");
             selcompound.checkBoolean(sel_[count_].isDynamic(), "Dynamic");
             ++count_;