X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fanalysis%2Fscoremodels%2FFeatureScoreModel.java;h=7d8e1fe89db64a983971360b1a77b3b530f44ea9;hb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;hp=e9347e41d7f342449ad8d1810eb4e9b05f73b321;hpb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;p=jalview.git
diff --git a/src/jalview/analysis/scoremodels/FeatureScoreModel.java b/src/jalview/analysis/scoremodels/FeatureScoreModel.java
index e9347e4..7d8e1fe 100644
--- a/src/jalview/analysis/scoremodels/FeatureScoreModel.java
+++ b/src/jalview/analysis/scoremodels/FeatureScoreModel.java
@@ -1,22 +1,42 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
+ *
+ * This file is part of Jalview.
+ *
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.analysis.scoremodels;
-import java.awt.Color;
-
-import jalview.analysis.AlignSeq;
import jalview.api.analysis.ScoreModelI;
import jalview.api.analysis.ViewBasedAnalysisI;
import jalview.datamodel.AlignmentView;
import jalview.datamodel.SeqCigar;
import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceI;
-import jalview.util.Comparison;
-public class FeatureScoreModel implements ScoreModelI,ViewBasedAnalysisI
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+
+public class FeatureScoreModel implements ScoreModelI, ViewBasedAnalysisI
{
jalview.api.FeatureRenderer fr;
-
- @Override
- public boolean configureFromAlignmentView(jalview.api.AlignmentViewPanel view)
+
+ @Override
+ public boolean configureFromAlignmentView(
+ jalview.api.AlignmentViewPanel view)
{
fr = view.cloneFeatureRenderer();
return true;
@@ -25,60 +45,117 @@ public class FeatureScoreModel implements ScoreModelI,ViewBasedAnalysisI
@Override
public float[][] findDistances(AlignmentView seqData)
{
-
- SequenceI[] sequenceString = seqData
- .getVisibleAlignment(Comparison.GapChars.charAt(0)).getSequencesArray();
- int noseqs = sequenceString.length;
- int cpwidth = seqData.getWidth();
+ int nofeats = 0;
+ List dft = fr.getDisplayedFeatureTypes();
+ nofeats = dft.size();
+ SeqCigar[] seqs = seqData.getSequences();
+ int noseqs = seqs.length;
+ int cpwidth = 0;// = seqData.getWidth();
float[][] distance = new float[noseqs][noseqs];
- float max=0;
- for (int cpos = 0;cpos> sfap = new ArrayList>();
+ for (int i = 0; i < noseqs; i++)
{
- max = distance[i][j];
+ Hashtable types = new Hashtable();
+ int spos = seqs[i].findPosition(cpos);
+ if (spos != -1)
+ {
+ List sfs = fr.findFeaturesAtRes(
+ seqs[i].getRefSeq(), spos);
+ for (SequenceFeature sf : sfs)
+ {
+ types.put(sf.getType(), sf);
+ }
+ }
+ sfap.add(types);
+ }
+ for (int i = 0; i < (noseqs - 1); i++)
+ {
+ if (cpos == 0)
+ {
+ distance[i][i] = 0f;
+ }
+ for (int j = i + 1; j < noseqs; j++)
+ {
+ int sfcommon = 0;
+ // compare the two lists of features...
+ Hashtable fi = sfap.get(i), fk, fj = sfap
+ .get(j);
+ if (fi.size() > fj.size())
+ {
+ fk = fj;
+ }
+ else
+ {
+ fk = fi;
+ fi = fj;
+ }
+ for (String k : fi.keySet())
+ {
+ SequenceFeature sfj = fk.get(k);
+ if (sfj != null)
+ {
+ sfcommon++;
+ }
+ }
+ distance[i][j] += (fi.size() + fk.size() - 2f * sfcommon);
+ distance[j][i] += distance[i][j];
+ }
}
}
}
- }
-
- for (int i = 0; i < (noseqs - 1); i++)
+ for (int i = 0; i < noseqs; i++)
{
- for (int j = i; j < noseqs; j++)
+ for (int j = i + 1; j < noseqs; j++)
{
- distance[i][j] = max - distance[i][j];
+ distance[i][j] /= cpwidth;
distance[j][i] = distance[i][j];
}
}
-
return distance;
}
@Override
public String getName()
{
- return "Smith Waterman Score";
+ return "Sequence Feature Similarity";
}
+
@Override
public boolean isDNA()
{
return true;
}
+
@Override
public boolean isProtein()
{
return true;
}
- public String toString() {
- return "Score between two sequences aligned with Smith Waterman with default Peptide/Nucleotide matrix";
+
+ @Override
+ public String toString()
+ {
+ return "Score between sequences based on hamming distance between binary vectors marking features displayed at each column";
}
}