JAL-1512 fix calculation once again and include score matrix documentation in comment...

diff --git a/help/html/calculations/scorematrices.html b/help/html/calculations/scorematrices.html
index fb3b0b2..3858b53 100644 (file)
--- a/help/html/calculations/scorematrices.html
+++ b/help/html/calculations/scorematrices.html
@@ -26,8 +26,9 @@
 <ul>
 <li><a href="#blosum62">BLOSUM62</a> is the standard protein sequence alignment and analysis matrix.</li>
 <li><a href="#pam250">PAM250</a> is another standard protein matrix, but not currently available for use from Jalview's user interface.</li>
-<li><a href="#simplenucleotide">Simple Nucleotide Substition</a> is a (fairly) arbitrary DNA/RNA substitution matrix.
-</li>
+<li><a href="#simplenucleotide">Simple Nucleotide Substition</a> is a (fairly) arbitrary DNA/RNA substitution matrix.</li>
+<!--  <li><a href="#conservation">Conservation Matrices</a> A range of matrices for distinguishing amino-acids by physicochemical property conservation.
+</li> -->
 </ul>
 
 <p><strong><a name="blosum62"></a>BLOSUM62</strong><br/>
@@ -87,7 +88,7 @@
 <tr><td>Z</td><td>0</td><td>2</td><td>-5</td><td>3</td><td>3</td><td>-5</td><td>0</td><td>2</td><td>-2</td><td>0</td><td>-3</td><td>-2</td><td>1</td><td>0</td><td>3</td><td>0</td><td>0</td><td>-1</td><td>-1</td><td>-2</td><td>-6</td><td>-1</td><td>-4</td><td>3</td></tr>
 </table>
 
-<p><strong><a name="simplenucleotide">Simple Nucleotide Substitution</a></strong></br>
+<p><strong><a name="simplenucleotide">Simple Nucleotide Substitution</a></strong><br>
 This is an ad-hoc matrix which, in addition to penalising mutations between the common nucleotides (ACGT), includes T/U equivalence in order to allow both DNA and/or RNA.
 In addition, it encodes weak equivalence between R and Y with AG and CTU, respectively, and N is allowed to match any other base weakly. This matrix also includes I (Inosine) and X (Xanthine), but encodes them to weakly match any of (ACGTU), and unfavourably match each other.
 <table border="1">
@@ -109,5 +110,100 @@ In addition, it encodes weak equivalence between R and Y with AG and CTU, respec
                                        - introduce a nucleotide substitution matrix that supports RNA/DNA
                                        and ambiguity codes</a>
                </em></strong>
+               </p>
+<!--  <p><strong><a name="conservation">Physicochemical property conservation</a></strong><br>
+Three different matrices are provided which reflect differences in physicochemical properties for different amino-acids.
+<ul><li><em>Conservation Both</em><br>Matrix elements count number of properties shared, and number of properties that both amino-acids *do not* have (e.g. hydrophobic and not polar).
+
+<table border="1"><tr><td></td><td>&nbsp;A&nbsp;</td><td>&nbsp;B&nbsp;</td><td>&nbsp;C&nbsp;</td><td>&nbsp;D&nbsp;</td><td>&nbsp;E&nbsp;</td><td>&nbsp;F&nbsp;</td><td>&nbsp;G&nbsp;</td><td>&nbsp;H&nbsp;</td><td>&nbsp;I&nbsp;</td><td>&nbsp;K&nbsp;</td><td>&nbsp;L&nbsp;</td><td>&nbsp;M&nbsp;</td><td>&nbsp;N&nbsp;</td><td>&nbsp;P&nbsp;</td><td>&nbsp;Q&nbsp;</td><td>&nbsp;R&nbsp;</td><td>&nbsp;S&nbsp;</td><td>&nbsp;T&nbsp;</td><td>&nbsp;U&nbsp;</td><td>&nbsp;V&nbsp;</td><td>&nbsp;W&nbsp;</td><td>&nbsp;X&nbsp;</td><td>&nbsp;Y&nbsp;</td><td>&nbsp;Z&nbsp;</td></tr>
+<tr><td>A</td><td>20</td><td>0</td><td>18</td><td>10</td><td>8</td><td>14</td><td>20</td><td>8</td><td>14</td><td>10</td><td>14</td><td>16</td><td>14</td><td>14</td><td>12</td><td>8</td><td>16</td><td>14</td><td>2</td><td>16</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>B</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><td>C</td><td>18</td><td>0</td><td>18</td><td>12</td><td>10</td><td>16</td><td>18</td><td>10</td><td>16</td><td>12</td><td>16</td><td>18</td><td>16</td><td>16</td><td>14</td><td>10</td><td>14</td><td>16</td><td>2</td><td>18</td><td>14</td><td>2</td><td>14</td><td>0</td></tr>
+<tr><td>D</td><td>10</td><td>0</td><td>12</td><td>18</td><td>18</td><td>8</td><td>10</td><td>10</td><td>8</td><td>12</td><td>8</td><td>10</td><td>16</td><td>12</td><td>14</td><td>14</td><td>14</td><td>16</td><td>2</td><td>10</td><td>10</td><td>2</td><td>10</td><td>0</td></tr>
+<tr><td>E</td><td>8</td><td>0</td><td>10</td><td>18</td><td>14</td><td>10</td><td>8</td><td>12</td><td>10</td><td>14</td><td>10</td><td>12</td><td>14</td><td>10</td><td>16</td><td>16</td><td>12</td><td>14</td><td>2</td><td>8</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>F</td><td>14</td><td>0</td><td>16</td><td>8</td><td>10</td><td>18</td><td>14</td><td>14</td><td>16</td><td>12</td><td>16</td><td>18</td><td>12</td><td>12</td><td>14</td><td>10</td><td>10</td><td>12</td><td>2</td><td>14</td><td>18</td><td>2</td><td>18</td><td>0</td></tr>
+<tr><td>G</td><td>20</td><td>0</td><td>18</td><td>10</td><td>8</td><td>14</td><td>16</td><td>8</td><td>14</td><td>10</td><td>14</td><td>16</td><td>14</td><td>14</td><td>12</td><td>8</td><td>16</td><td>14</td><td>2</td><td>16</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>H</td><td>8</td><td>0</td><td>10</td><td>10</td><td>12</td><td>14</td><td>8</td><td>18</td><td>10</td><td>18</td><td>10</td><td>12</td><td>10</td><td>6</td><td>12</td><td>16</td><td>8</td><td>10</td><td>4</td><td>8</td><td>16</td><td>4</td><td>16</td><td>0</td></tr>
+<tr><td>I</td><td>14</td><td>0</td><td>16</td><td>8</td><td>10</td><td>16</td><td>14</td><td>10</td><td>20</td><td>12</td><td>20</td><td>18</td><td>12</td><td>12</td><td>14</td><td>10</td><td>10</td><td>12</td><td>2</td><td>18</td><td>14</td><td>2</td><td>14</td><td>0</td></tr>
+<tr><td>K</td><td>10</td><td>0</td><td>12</td><td>12</td><td>14</td><td>12</td><td>10</td><td>18</td><td>12</td><td>14</td><td>12</td><td>14</td><td>12</td><td>8</td><td>14</td><td>18</td><td>10</td><td>12</td><td>4</td><td>10</td><td>14</td><td>4</td><td>14</td><td>0</td></tr>
+<tr><td>L</td><td>14</td><td>0</td><td>16</td><td>8</td><td>10</td><td>16</td><td>14</td><td>10</td><td>20</td><td>12</td><td>18</td><td>18</td><td>12</td><td>12</td><td>14</td><td>10</td><td>10</td><td>12</td><td>2</td><td>18</td><td>14</td><td>2</td><td>14</td><td>0</td></tr>
+<tr><td>M</td><td>16</td><td>0</td><td>18</td><td>10</td><td>12</td><td>18</td><td>16</td><td>12</td><td>18</td><td>14</td><td>18</td><td>18</td><td>14</td><td>14</td><td>16</td><td>12</td><td>12</td><td>14</td><td>2</td><td>16</td><td>16</td><td>2</td><td>16</td><td>0</td></tr>
+<tr><td>N</td><td>14</td><td>0</td><td>16</td><td>16</td><td>14</td><td>12</td><td>14</td><td>10</td><td>12</td><td>12</td><td>12</td><td>14</td><td>20</td><td>16</td><td>18</td><td>14</td><td>18</td><td>20</td><td>2</td><td>14</td><td>14</td><td>2</td><td>14</td><td>0</td></tr>
+<tr><td>P</td><td>14</td><td>0</td><td>16</td><td>12</td><td>10</td><td>12</td><td>14</td><td>6</td><td>12</td><td>8</td><td>12</td><td>14</td><td>16</td><td>16</td><td>14</td><td>10</td><td>14</td><td>16</td><td>0</td><td>14</td><td>10</td><td>0</td><td>10</td><td>0</td></tr>
+<tr><td>Q</td><td>12</td><td>0</td><td>14</td><td>14</td><td>16</td><td>14</td><td>12</td><td>12</td><td>14</td><td>14</td><td>14</td><td>16</td><td>18</td><td>14</td><td>18</td><td>16</td><td>16</td><td>18</td><td>2</td><td>12</td><td>16</td><td>2</td><td>16</td><td>0</td></tr>
+<tr><td>R</td><td>8</td><td>0</td><td>10</td><td>14</td><td>16</td><td>10</td><td>8</td><td>16</td><td>10</td><td>18</td><td>10</td><td>12</td><td>14</td><td>10</td><td>16</td><td>18</td><td>12</td><td>14</td><td>2</td><td>8</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>S</td><td>16</td><td>0</td><td>14</td><td>14</td><td>12</td><td>10</td><td>16</td><td>8</td><td>10</td><td>10</td><td>10</td><td>12</td><td>18</td><td>14</td><td>16</td><td>12</td><td>18</td><td>18</td><td>2</td><td>12</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>T</td><td>14</td><td>0</td><td>16</td><td>16</td><td>14</td><td>12</td><td>14</td><td>10</td><td>12</td><td>12</td><td>12</td><td>14</td><td>20</td><td>16</td><td>18</td><td>14</td><td>18</td><td>14</td><td>2</td><td>14</td><td>14</td><td>2</td><td>14</td><td>0</td></tr>
+<tr><td>U</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>4</td><td>0</td><td>4</td><td>0</td></tr>
+<tr><td>V</td><td>16</td><td>0</td><td>18</td><td>10</td><td>8</td><td>14</td><td>16</td><td>8</td><td>18</td><td>10</td><td>18</td><td>16</td><td>14</td><td>14</td><td>12</td><td>8</td><td>12</td><td>14</td><td>2</td><td>2</td><td>12</td><td>2</td><td>12</td><td>0</td></tr>
+<tr><td>W</td><td>12</td><td>0</td><td>14</td><td>10</td><td>12</td><td>18</td><td>12</td><td>16</td><td>14</td><td>14</td><td>14</td><td>16</td><td>14</td><td>10</td><td>16</td><td>12</td><td>12</td><td>14</td><td>4</td><td>12</td><td>20</td><td>4</td><td>20</td><td>0</td></tr>
+<tr><td>X</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>4</td><td>0</td><td>4</td><td>0</td></tr>
+<tr><td>Y</td><td>12</td><td>0</td><td>14</td><td>10</td><td>12</td><td>18</td><td>12</td><td>16</td><td>14</td><td>14</td><td>14</td><td>16</td><td>14</td><td>10</td><td>16</td><td>12</td><td>12</td><td>14</td><td>4</td><td>12</td><td>20</td><td>4</td><td>12</td><td>0</td></tr>
+<tr><td>Z</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+</table>
+
+<li><em>Conservation Pos</em><br>Count number of properties that amino acids both have in common.
+
+<table border="1"><tr><td></td><td>&nbsp;A&nbsp;</td><td>&nbsp;B&nbsp;</td><td>&nbsp;C&nbsp;</td><td>&nbsp;D&nbsp;</td><td>&nbsp;E&nbsp;</td><td>&nbsp;F&nbsp;</td><td>&nbsp;G&nbsp;</td><td>&nbsp;H&nbsp;</td><td>&nbsp;I&nbsp;</td><td>&nbsp;K&nbsp;</td><td>&nbsp;L&nbsp;</td><td>&nbsp;M&nbsp;</td><td>&nbsp;N&nbsp;</td><td>&nbsp;P&nbsp;</td><td>&nbsp;Q&nbsp;</td><td>&nbsp;R&nbsp;</td><td>&nbsp;S&nbsp;</td><td>&nbsp;T&nbsp;</td><td>&nbsp;U&nbsp;</td><td>&nbsp;V&nbsp;</td><td>&nbsp;W&nbsp;</td><td>&nbsp;X&nbsp;</td><td>&nbsp;Y&nbsp;</td><td>&nbsp;Z&nbsp;</td></tr>
+<tr><td>A</td><td>6</td><td>0</td><td>4</td><td>2</td><td>0</td><td>2</td><td>6</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>B</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><td>C</td><td>4</td><td>0</td><td>4</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>D</td><td>2</td><td>0</td><td>2</td><td>6</td><td>6</td><td>0</td><td>2</td><td>4</td><td>0</td><td>4</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>4</td><td>4</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>E</td><td>0</td><td>0</td><td>0</td><td>6</td><td>4</td><td>0</td><td>0</td><td>4</td><td>0</td><td>4</td><td>0</td><td>0</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>F</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>0</td></tr>
+<tr><td>G</td><td>6</td><td>0</td><td>4</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>H</td><td>2</td><td>0</td><td>2</td><td>4</td><td>4</td><td>4</td><td>2</td><td>8</td><td>2</td><td>8</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>6</td><td>2</td><td>2</td><td>4</td><td>2</td><td>6</td><td>4</td><td>6</td><td>0</td></tr>
+<tr><td>I</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>K</td><td>2</td><td>0</td><td>2</td><td>4</td><td>4</td><td>2</td><td>2</td><td>8</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>6</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>4</td><td>4</td><td>0</td></tr>
+<tr><td>L</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>M</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>N</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>0</td><td>2</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>2</td><td>4</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>P</td><td>2</td><td>0</td><td>2</td><td>2</td><td>0</td><td>0</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>2</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><td>Q</td><td>0</td><td>0</td><td>0</td><td>2</td><td>2</td><td>0</td><td>0</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>R</td><td>0</td><td>0</td><td>0</td><td>4</td><td>4</td><td>0</td><td>0</td><td>6</td><td>0</td><td>6</td><td>0</td><td>0</td><td>2</td><td>0</td><td>2</td><td>6</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>S</td><td>4</td><td>0</td><td>2</td><td>4</td><td>2</td><td>0</td><td>4</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>2</td><td>4</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>T</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>0</td><td>2</td><td>2</td><td>0</td><td>2</td><td>0</td><td>0</td><td>4</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>U</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>4</td><td>0</td><td>4</td><td>0</td></tr>
+<tr><td>V</td><td>4</td><td>0</td><td>4</td><td>2</td><td>0</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td></tr>
+<tr><td>W</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>6</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>6</td><td>4</td><td>6</td><td>0</td></tr>
+<tr><td>X</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>4</td><td>0</td><td>4</td><td>0</td></tr>
+<tr><td>Y</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>6</td><td>2</td><td>4</td><td>2</td><td>2</td><td>2</td><td>0</td><td>2</td><td>2</td><td>2</td><td>2</td><td>4</td><td>2</td><td>6</td><td>4</td><td>4</td><td>0</td></tr>
+<tr><td>Z</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+</table>
+
+</li>
+<li>
+<em>Conservation EnhPos</em><br>Distinguish amino acids based on properties they have in common or lack, emphasising those they have in common.
+
+<table border="1"><tr><td></td><td>&nbsp;A&nbsp;</td><td>&nbsp;B&nbsp;</td><td>&nbsp;C&nbsp;</td><td>&nbsp;D&nbsp;</td><td>&nbsp;E&nbsp;</td><td>&nbsp;F&nbsp;</td><td>&nbsp;G&nbsp;</td><td>&nbsp;H&nbsp;</td><td>&nbsp;I&nbsp;</td><td>&nbsp;K&nbsp;</td><td>&nbsp;L&nbsp;</td><td>&nbsp;M&nbsp;</td><td>&nbsp;N&nbsp;</td><td>&nbsp;P&nbsp;</td><td>&nbsp;Q&nbsp;</td><td>&nbsp;R&nbsp;</td><td>&nbsp;S&nbsp;</td><td>&nbsp;T&nbsp;</td><td>&nbsp;U&nbsp;</td><td>&nbsp;V&nbsp;</td><td>&nbsp;W&nbsp;</td><td>&nbsp;X&nbsp;</td><td>&nbsp;Y&nbsp;</td><td>&nbsp;Z&nbsp;</td></tr>
+<tr><td>A</td><td>16</td><td>0</td><td>13</td><td>7</td><td>4</td><td>9</td><td>16</td><td>6</td><td>9</td><td>7</td><td>9</td><td>10</td><td>9</td><td>9</td><td>6</td><td>4</td><td>12</td><td>9</td><td>3</td><td>12</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>B</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+<tr><td>C</td><td>13</td><td>0</td><td>13</td><td>8</td><td>5</td><td>10</td><td>13</td><td>7</td><td>10</td><td>8</td><td>10</td><td>11</td><td>10</td><td>10</td><td>7</td><td>5</td><td>9</td><td>10</td><td>3</td><td>13</td><td>9</td><td>3</td><td>9</td><td>0</td></tr>
+<tr><td>D</td><td>7</td><td>0</td><td>8</td><td>15</td><td>15</td><td>4</td><td>7</td><td>9</td><td>4</td><td>10</td><td>4</td><td>5</td><td>12</td><td>8</td><td>9</td><td>11</td><td>11</td><td>12</td><td>3</td><td>7</td><td>7</td><td>3</td><td>7</td><td>0</td></tr>
+<tr><td>E</td><td>4</td><td>0</td><td>5</td><td>15</td><td>11</td><td>5</td><td>4</td><td>10</td><td>5</td><td>11</td><td>5</td><td>6</td><td>9</td><td>5</td><td>10</td><td>12</td><td>8</td><td>9</td><td>3</td><td>4</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>F</td><td>9</td><td>0</td><td>10</td><td>4</td><td>5</td><td>13</td><td>9</td><td>11</td><td>10</td><td>8</td><td>10</td><td>11</td><td>6</td><td>6</td><td>7</td><td>5</td><td>5</td><td>6</td><td>3</td><td>9</td><td>13</td><td>3</td><td>13</td><td>0</td></tr>
+<tr><td>G</td><td>16</td><td>0</td><td>13</td><td>7</td><td>4</td><td>9</td><td>12</td><td>6</td><td>9</td><td>7</td><td>9</td><td>10</td><td>9</td><td>9</td><td>6</td><td>4</td><td>12</td><td>9</td><td>3</td><td>12</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>H</td><td>6</td><td>0</td><td>7</td><td>9</td><td>10</td><td>11</td><td>6</td><td>17</td><td>7</td><td>17</td><td>7</td><td>8</td><td>7</td><td>3</td><td>8</td><td>14</td><td>6</td><td>7</td><td>6</td><td>6</td><td>14</td><td>6</td><td>14</td><td>0</td></tr>
+<tr><td>I</td><td>9</td><td>0</td><td>10</td><td>4</td><td>5</td><td>10</td><td>9</td><td>7</td><td>14</td><td>8</td><td>14</td><td>11</td><td>6</td><td>6</td><td>7</td><td>5</td><td>5</td><td>6</td><td>3</td><td>13</td><td>9</td><td>3</td><td>9</td><td>0</td></tr>
+<tr><td>K</td><td>7</td><td>0</td><td>8</td><td>10</td><td>11</td><td>8</td><td>7</td><td>17</td><td>8</td><td>11</td><td>8</td><td>9</td><td>8</td><td>4</td><td>9</td><td>15</td><td>7</td><td>8</td><td>6</td><td>7</td><td>11</td><td>6</td><td>11</td><td>0</td></tr>
+<tr><td>L</td><td>9</td><td>0</td><td>10</td><td>4</td><td>5</td><td>10</td><td>9</td><td>7</td><td>14</td><td>8</td><td>13</td><td>11</td><td>6</td><td>6</td><td>7</td><td>5</td><td>5</td><td>6</td><td>3</td><td>13</td><td>9</td><td>3</td><td>9</td><td>0</td></tr>
+<tr><td>M</td><td>10</td><td>0</td><td>11</td><td>5</td><td>6</td><td>11</td><td>10</td><td>8</td><td>11</td><td>9</td><td>11</td><td>11</td><td>7</td><td>7</td><td>8</td><td>6</td><td>6</td><td>7</td><td>3</td><td>10</td><td>10</td><td>3</td><td>10</td><td>0</td></tr>
+<tr><td>N</td><td>9</td><td>0</td><td>10</td><td>12</td><td>9</td><td>6</td><td>9</td><td>7</td><td>6</td><td>8</td><td>6</td><td>7</td><td>14</td><td>10</td><td>11</td><td>9</td><td>13</td><td>14</td><td>3</td><td>9</td><td>9</td><td>3</td><td>9</td><td>0</td></tr>
+<tr><td>P</td><td>9</td><td>0</td><td>10</td><td>8</td><td>5</td><td>6</td><td>9</td><td>3</td><td>6</td><td>4</td><td>6</td><td>7</td><td>10</td><td>10</td><td>7</td><td>5</td><td>9</td><td>10</td><td>0</td><td>9</td><td>5</td><td>0</td><td>5</td><td>0</td></tr>
+<tr><td>Q</td><td>6</td><td>0</td><td>7</td><td>9</td><td>10</td><td>7</td><td>6</td><td>8</td><td>7</td><td>9</td><td>7</td><td>8</td><td>11</td><td>7</td><td>11</td><td>10</td><td>10</td><td>11</td><td>3</td><td>6</td><td>10</td><td>3</td><td>10</td><td>0</td></tr>
+<tr><td>R</td><td>4</td><td>0</td><td>5</td><td>11</td><td>12</td><td>5</td><td>4</td><td>14</td><td>5</td><td>15</td><td>5</td><td>6</td><td>9</td><td>5</td><td>10</td><td>15</td><td>8</td><td>9</td><td>3</td><td>4</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>S</td><td>12</td><td>0</td><td>9</td><td>11</td><td>8</td><td>5</td><td>12</td><td>6</td><td>5</td><td>7</td><td>5</td><td>6</td><td>13</td><td>9</td><td>10</td><td>8</td><td>13</td><td>13</td><td>3</td><td>8</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>T</td><td>9</td><td>0</td><td>10</td><td>12</td><td>9</td><td>6</td><td>9</td><td>7</td><td>6</td><td>8</td><td>6</td><td>7</td><td>14</td><td>10</td><td>11</td><td>9</td><td>13</td><td>9</td><td>3</td><td>9</td><td>9</td><td>3</td><td>9</td><td>0</td></tr>
+<tr><td>U</td><td>3</td><td>0</td><td>3</td><td>3</td><td>3</td><td>3</td><td>3</td><td>6</td><td>3</td><td>6</td><td>3</td><td>3</td><td>3</td><td>0</td><td>3</td><td>3</td><td>3</td><td>3</td><td>0</td><td>3</td><td>6</td><td>0</td><td>6</td><td>0</td></tr>
+<tr><td>V</td><td>12</td><td>0</td><td>13</td><td>7</td><td>4</td><td>9</td><td>12</td><td>6</td><td>13</td><td>7</td><td>13</td><td>10</td><td>9</td><td>9</td><td>6</td><td>4</td><td>8</td><td>9</td><td>3</td><td>3</td><td>8</td><td>3</td><td>8</td><td>0</td></tr>
+<tr><td>W</td><td>8</td><td>0</td><td>9</td><td>7</td><td>8</td><td>13</td><td>8</td><td>14</td><td>9</td><td>11</td><td>9</td><td>10</td><td>9</td><td>5</td><td>10</td><td>8</td><td>8</td><td>9</td><td>6</td><td>8</td><td>16</td><td>6</td><td>16</td><td>0</td></tr>
+<tr><td>X</td><td>3</td><td>0</td><td>3</td><td>3</td><td>3</td><td>3</td><td>3</td><td>6</td><td>3</td><td>6</td><td>3</td><td>3</td><td>3</td><td>0</td><td>3</td><td>3</td><td>3</td><td>3</td><td>0</td><td>3</td><td>6</td><td>0</td><td>6</td><td>0</td></tr>
+<tr><td>Y</td><td>8</td><td>0</td><td>9</td><td>7</td><td>8</td><td>13</td><td>8</td><td>14</td><td>9</td><td>11</td><td>9</td><td>10</td><td>9</td><td>5</td><td>10</td><td>8</td><td>8</td><td>9</td><td>6</td><td>8</td><td>16</td><td>6</td><td>8</td><td>0</td></tr>
+<tr><td>Z</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td></tr>
+</table>
+
+
+</li> -->
+</ul>
                </body>
 </html>

diff --git a/src/jalview/schemes/ResidueProperties.java b/src/jalview/schemes/ResidueProperties.java
index 7dd6520..56faf2a 100755 (executable)
--- a/src/jalview/schemes/ResidueProperties.java
+++ b/src/jalview/schemes/ResidueProperties.java
@@ -1425,14 +1425,12 @@ public class ResidueProperties
             propMatrixEpos = new int[maxProteinIndex][maxProteinIndex];
     for (int i=0;i<maxProteinIndex;i++)
     {
+      int maxF=0,maxP=0,maxEP=0;
       String ic="";
       if (aa.length>i) {
         ic+=aa[i];
       }
       else {ic = "-";}
-      propMatrixF[i][i]=propHash.size();
-      propMatrixPos[i][i]=propHash.size();
-      propMatrixEpos[i][i]=propHash.size();
       for (int j=i+1;j<maxProteinIndex; j++)
       {
         String jc="";
@@ -1449,19 +1447,34 @@ public class ResidueProperties
           Map<String,Integer> pph=(Map<String,Integer>)propHash.get(ph);
           if (pph.get(ic)!=null && pph.get(jc)!=null) {
             int icp=pph.get(ic).intValue(),jcp=pph.get(jc).intValue();
-
-            propMatrixPos[i][j] += icp == jcp ? icp : -1;
-            propMatrixPos[j][i] += icp == jcp ? icp : -1;
-            propMatrixF[i][j] += icp == jcp ? 2 : -1;
-            propMatrixF[j][i] += icp == jcp ? 2 : -1;
-            propMatrixEpos[i][j] += icp == jcp ? (1+icp * 2) : -1;
-            propMatrixEpos[j][i] += icp == jcp ? (1+icp * 2) : -1;
+            // Still working on these definitions.
+            propMatrixPos[i][j] += icp == jcp && icp>0 ? 2 : 0;
+            propMatrixPos[j][i] += icp == jcp && icp>0 ? 2 : 0;
+            propMatrixF[i][j] += icp == jcp ? 2 : 0;
+            propMatrixF[j][i] += icp == jcp ? 2 : 0;
+            propMatrixEpos[i][j] += icp == jcp ? (1+icp * 2) : 0;
+            propMatrixEpos[j][i] += icp == jcp ? (1+icp * 2) : 0;
         }}
+        if (maxF<propMatrixF[i][j])
+        {
+          maxF=propMatrixF[i][j];
+        }
+        if (maxP<propMatrixPos[i][j])
+        {
+          maxP=propMatrixPos[i][j];
+        }
+        if (maxEP<propMatrixEpos[i][j])
+        {
+          maxEP=propMatrixEpos[i][j];
+        }
       }
+      propMatrixF[i][i]=maxF;
+      propMatrixPos[i][i]=maxP;
+      propMatrixEpos[i][i]=maxEP;
     }
     
-    scoreMatrices.put("Conservation Pos", new ScoreMatrix("Conservation Pos",propMatrixF,0));
-    scoreMatrices.put("Conservation Both", new ScoreMatrix("Conservation Both",propMatrixPos,0));
+    scoreMatrices.put("Conservation Pos", new ScoreMatrix("Conservation Pos",propMatrixPos,0));
+    scoreMatrices.put("Conservation Both", new ScoreMatrix("Conservation Both",propMatrixF,0));
     scoreMatrices.put("Conservation EnhPos", new ScoreMatrix("Conservation EnhPos",propMatrixEpos,0));
     scoreMatrices.put("PID", new PIDScoreModel());
   }