X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=schemas%2Fjalview.xsd;h=07dee982439467504808729fe51d4972477f7dd7;hb=bc18effe68ba80213a6d03ca7e6175adc6be71d6;hp=109b83b507819d9b9a7261bc75482d656126a3e2;hpb=d6815a9bc0fc9b9c1fe8e1871a4b0e9d7bd7a11f;p=jalview.git

diff --git a/schemas/jalview.xsd b/schemas/jalview.xsd
index 109b83b..07dee98 100755
--- a/schemas/jalview.xsd
+++ b/schemas/jalview.xsd
@@ -10,6 +10,11 @@
 	Public License for more details. * * You should have received a copy of the 
 	GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>. 
 	* The Jalview Authors are detailed in the 'AUTHORS' file. -->
+<!-- 
+	Java JAXB binding classes are generated by running command line tool xjc:
+ 	    xjc schemas/jalview.xsd -d src -p jalview.xml.binding.jalview
+ 	Note this also generates code for included schemas
+-->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
 	xmlns:vamsas="www.vamsas.ac.uk/jalview/version2" xmlns:jalview="www.jalview.org/colours"
 	xmlns:jv="www.jalview.org" xmlns:jvws="www.jalview.org/xml/wsparamset"
@@ -21,6 +26,7 @@
 		schemaLocation="JalviewUserColours.xsd" />
 	<xs:import namespace="www.jalview.org/xml/wsparamset"
 		schemaLocation="JalviewWsParamSet.xsd" />
+	<xs:element name="JalviewModel" type="jv:JalviewModel" />
 	<xs:complexType name="JalviewModel">
 		<xs:sequence>
 			<xs:element name="creationDate" type="xs:dateTime" />
@@ -699,27 +705,21 @@
 			</xs:documentation>
 		</xs:annotation>
 		<xs:sequence>
-			<xs:element name="details" type="xs:string">
-				<xs:annotation>
-					<xs:documentation>
-						The text report of the calculation
-					</xs:documentation>
-				</xs:annotation>
-			</xs:element>
 			<xs:element name="pairwiseMatrix" type="jv:DoubleMatrix" />
+			<xs:element name="tridiagonalMatrix" type="jv:DoubleMatrix" />
 			<xs:element name="eigenMatrix" type="jv:DoubleMatrix" />
-			<xs:element name="eigenMatrixD" type="jv:DoubleVector" />
-			<xs:element name="eigenMatrixE" type="jv:DoubleVector" />
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="DoubleVector">
 		<xs:sequence>
-			<xs:element name="d" type="xs:double" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="v" type="xs:double" minOccurs="0" maxOccurs="unbounded" />
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="DoubleMatrix">
 		<xs:sequence>
 			<xs:element name="row" type="jv:DoubleVector" minOccurs="0" maxOccurs="unbounded" />
+			<xs:element name="D" minOccurs="0" type="jv:DoubleVector" />
+			<xs:element name="E" minOccurs="0" type="jv:DoubleVector" />
 		</xs:sequence>
 		<xs:attribute name="rows"  type="xs:int" />
 		<xs:attribute name="columns" type="xs:int" />