JAL-1767 scheme DoubleMatrix type includes D and E vectors (optional)

[jalview.git] / src / jalview / schemabinding / version2 / PcaDataType.java

diff --git a/src/jalview/schemabinding/version2/PcaDataType.java b/src/jalview/schemabinding/version2/PcaDataType.java
index 0335b44..42f1723 100644 (file)
--- a/src/jalview/schemabinding/version2/PcaDataType.java
+++ b/src/jalview/schemabinding/version2/PcaDataType.java
@@ -28,30 +28,19 @@ public class PcaDataType implements java.io.Serializable
   // --------------------------/
 
   /**
-   * The text report of the calculation
-   * 
-   */
-  private java.lang.String _details;
-
-  /**
    * Field _pairwiseMatrix.
    */
   private jalview.schemabinding.version2.PairwiseMatrix _pairwiseMatrix;
 
   /**
-   * Field _eigenMatrix.
+   * Field _tridiagonalMatrix.
    */
-  private jalview.schemabinding.version2.EigenMatrix _eigenMatrix;
+  private jalview.schemabinding.version2.TridiagonalMatrix _tridiagonalMatrix;
 
   /**
-   * Field _eigenMatrixD.
-   */
-  private jalview.schemabinding.version2.EigenMatrixD _eigenMatrixD;
-
-  /**
-   * Field _eigenMatrixE.
+   * Field _eigenMatrix.
    */
-  private jalview.schemabinding.version2.EigenMatrixE _eigenMatrixE;
+  private jalview.schemabinding.version2.EigenMatrix _eigenMatrix;
 
   // ----------------/
   // - Constructors -/
@@ -67,18 +56,6 @@ public class PcaDataType implements java.io.Serializable
   // -----------/
 
   /**
-   * Returns the value of field 'details'. The field 'details' has the following
-   * description: The text report of the calculation
-   * 
-   * 
-   * @return the value of field 'Details'.
-   */
-  public java.lang.String getDetails()
-  {
-    return this._details;
-  }
-
-  /**
    * Returns the value of field 'eigenMatrix'.
    * 
    * @return the value of field 'EigenMatrix'.
@@ -89,33 +66,23 @@ public class PcaDataType implements java.io.Serializable
   }
 
   /**
-   * Returns the value of field 'eigenMatrixD'.
+   * Returns the value of field 'pairwiseMatrix'.
    * 
-   * @return the value of field 'EigenMatrixD'.
+   * @return the value of field 'PairwiseMatrix'.
    */
-  public jalview.schemabinding.version2.EigenMatrixD getEigenMatrixD()
+  public jalview.schemabinding.version2.PairwiseMatrix getPairwiseMatrix()
   {
-    return this._eigenMatrixD;
+    return this._pairwiseMatrix;
   }
 
   /**
-   * Returns the value of field 'eigenMatrixE'.
+   * Returns the value of field 'tridiagonalMatrix'.
    * 
-   * @return the value of field 'EigenMatrixE'.
+   * @return the value of field 'TridiagonalMatrix'.
    */
-  public jalview.schemabinding.version2.EigenMatrixE getEigenMatrixE()
+  public jalview.schemabinding.version2.TridiagonalMatrix getTridiagonalMatrix()
   {
-    return this._eigenMatrixE;
-  }
-
-  /**
-   * Returns the value of field 'pairwiseMatrix'.
-   * 
-   * @return the value of field 'PairwiseMatrix'.
-   */
-  public jalview.schemabinding.version2.PairwiseMatrix getPairwiseMatrix()
-  {
-    return this._pairwiseMatrix;
+    return this._tridiagonalMatrix;
   }
 
   /**
@@ -173,19 +140,6 @@ public class PcaDataType implements java.io.Serializable
   }
 
   /**
-   * Sets the value of field 'details'. The field 'details' has the following
-   * description: The text report of the calculation
-   * 
-   * 
-   * @param details
-   *          the value of field 'details'.
-   */
-  public void setDetails(final java.lang.String details)
-  {
-    this._details = details;
-  }
-
-  /**
    * Sets the value of field 'eigenMatrix'.
    * 
    * @param eigenMatrix
@@ -198,30 +152,6 @@ public class PcaDataType implements java.io.Serializable
   }
 
   /**
-   * Sets the value of field 'eigenMatrixD'.
-   * 
-   * @param eigenMatrixD
-   *          the value of field 'eigenMatrixD'.
-   */
-  public void setEigenMatrixD(
-          final jalview.schemabinding.version2.EigenMatrixD eigenMatrixD)
-  {
-    this._eigenMatrixD = eigenMatrixD;
-  }
-
-  /**
-   * Sets the value of field 'eigenMatrixE'.
-   * 
-   * @param eigenMatrixE
-   *          the value of field 'eigenMatrixE'.
-   */
-  public void setEigenMatrixE(
-          final jalview.schemabinding.version2.EigenMatrixE eigenMatrixE)
-  {
-    this._eigenMatrixE = eigenMatrixE;
-  }
-
-  /**
    * Sets the value of field 'pairwiseMatrix'.
    * 
    * @param pairwiseMatrix
@@ -234,6 +164,18 @@ public class PcaDataType implements java.io.Serializable
   }
 
   /**
+   * Sets the value of field 'tridiagonalMatrix'.
+   * 
+   * @param tridiagonalMatrix
+   *          the value of field 'tridiagonalMatrix'.
+   */
+  public void setTridiagonalMatrix(
+          final jalview.schemabinding.version2.TridiagonalMatrix tridiagonalMatrix)
+  {
+    this._tridiagonalMatrix = tridiagonalMatrix;
+  }
+
+  /**
    * Method unmarshal.
    * 
    * @param reader