From babf82b5a3c475534a4e3d80df9c2f5c5a8926cf Mon Sep 17 00:00:00 2001 From: "cmzmasek@gmail.com" Date: Tue, 4 Dec 2012 22:50:27 +0000 Subject: [PATCH] in progress --- forester/java/src/org/forester/phylogeny/Edge.java | 45 -------------------- .../org/forester/phylogeny/PhylogenyBranch.java | 5 +-- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 forester/java/src/org/forester/phylogeny/Edge.java diff --git a/forester/java/src/org/forester/phylogeny/Edge.java b/forester/java/src/org/forester/phylogeny/Edge.java deleted file mode 100644 index c628b93..0000000 --- a/forester/java/src/org/forester/phylogeny/Edge.java +++ /dev/null @@ -1,45 +0,0 @@ -// $Id: -// FORESTER -- software libraries and applications -// for evolutionary biology research and applications. -// -// Copyright (C) 2008-2009 Christian M. Zmasek -// Copyright (C) 2008-2009 Burnham Institute for Medical Research -// Copyright (C) 2000-2001 Washington University School of Medicine -// and Howard Hughes Medical Institute -// All rights reserved -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library 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 -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA -// -// Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester - -package org.forester.phylogeny; - -import org.forester.phylogeny.data.PhylogenyData; - -/* - * @author Christian Zmasek - * - * Interface for edges connecting nodes, for example branches in a phylgenetic - * network/tree. - */ -public interface Edge { - - public PhylogenyData getData(); - - public PhylogenyNode getFirstNode(); - - public PhylogenyNode getSecondNode(); -} \ No newline at end of file diff --git a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java index 4a4f7fb..5752fbf 100644 --- a/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java +++ b/forester/java/src/org/forester/phylogeny/PhylogenyBranch.java @@ -32,7 +32,7 @@ import org.forester.phylogeny.data.PhylogenyData; /* * @author Christian M. Zmasek */ -public class PhylogenyBranch implements Edge { +public class PhylogenyBranch { private final PhylogenyNode _node_1; private final PhylogenyNode _node_2; @@ -89,17 +89,14 @@ public class PhylogenyBranch implements Edge { } } - @Override public PhylogenyData getData() { return _data; } - @Override public PhylogenyNode getFirstNode() { return _node_1; } - @Override public PhylogenyNode getSecondNode() { return _node_2; } -- 1.7.10.2