protected void calculate_actionPerformed()
{
boolean doPCA = pca.isSelected();
- String modelName = modelNames.getSelectedItem().toString();
+ String substitutionMatrix = modelNames.getSelectedItem().toString();
SimilarityParamsI params = getSimilarityParameters(doPCA);
if (doPCA)
{
- openPcaPanel(modelName, params);
+ openPcaPanel(substitutionMatrix, params);
}
else
{
- calculateTree();
- openTreePanel(modelName, params);
+
+ String treeAlgo = determineTreeAlgo();
+ // TreeCalculator calculateTree = new TreeCalculator(treeAlgo,
+ // substitutionMatrix, params);
+
+ openTreePanel(treeAlgo, substitutionMatrix, params);
}
// closeFrame();
}
- protected void calculateTree()
- {
-
- }
protected String determineTreeAlgo() // to be modified & expanded
{
String treeAlgorithm = neighbourJoining.isSelected()
* Open a new Tree panel on the desktop
*
*/
- protected void openTreePanel(String modelName, SimilarityParamsI params)
+ protected void openTreePanel(String treeType, String substitutionMatrix,
+ SimilarityParamsI params)
{
/*
* gui validation shouldn't allow insufficient sequences here, but leave
*/
checkEnoughSequences(af.getViewport());
- String treeType = determineTreeAlgo();
- af.newTreePanel(treeType, modelName, params);
+
+ af.newTreePanel(treeType, substitutionMatrix, params);
}
/**