2)) { // have to add in other branch
+ double otherLength = tree.getBranchLength(tree.nextSisterOfNode(node));
+ if (MesquiteDouble.isCombinable(otherLength))
+ terminalBranchLength+= otherLength;
+ }
+ results.setValue(it, terminalBranchLength);
+ }
+ }
+ saveLastResult(results);
+ saveLastResultString(resultsString);
+ }
+ /*.................................................................................................................*/
+ /** returns the version number at which this module was first released. If 0, then no version number is claimed. If a POSITIVE integer
+ * then the number refers to the Mesquite version. This should be used only by modules part of the core release of Mesquite.
+ * If a NEGATIVE integer, then the number refers to the local version of the package, e.g. a third party package*/
+ public int getVersionOfFirstRelease(){
+ return 370;
+ }
+ /*.................................................................................................................*/
+ public String getVeryShortName() {
+ return "Terminal Branch Length";
+ }
+ /*.................................................................................................................*/
+ public String getName() {
+ return "Terminal Branch Length";
+ }
+ /*.................................................................................................................*/
+ public String getVersion() {
+ return null;
+ }
+ /*.................................................................................................................*/
+ public boolean isPrerelease() {
+ return false;
+ }
+ /*.................................................................................................................*/
+ /** returns an explanation of what the module does.*/
+ public String getExplanation() {
+ return "For each taxon, calculates the length of the terminal branch on the tree, if present. If a taxon is a descendant of a dichotomous root in a tree with more than 2 taxa, then the length of the other descendant is also added in. .";
+ }
+
+}
+
diff --git a/Source/mesquite/trees/lib/ManyTreesFromFileLib.java b/Source/mesquite/trees/lib/ManyTreesFromFileLib.java
index f9be703e9..1ec4626fc 100644
--- a/Source/mesquite/trees/lib/ManyTreesFromFileLib.java
+++ b/Source/mesquite/trees/lib/ManyTreesFromFileLib.java
@@ -210,7 +210,7 @@ private int findTreeNumber(int treeNum) {
}
return treeNum;
}
- boolean fileReady = false;
+ protected boolean fileReady = false;
/*.................................................................................................................*/
private boolean obtainFile(String arguments){
fileReady = false;
@@ -267,7 +267,7 @@ private boolean getFileFromPath(String pathName){
}
return (file != null);
}
- private boolean processFile(){
+ protected boolean processFile(){
if (!goToTreeBlock(file))
return false;
if (!processTreeBlock())
diff --git a/Source/mesquite/trunk/AboutPanel.java b/Source/mesquite/trunk/AboutPanel.java
index 531e374e7..c523cf23a 100644
--- a/Source/mesquite/trunk/AboutPanel.java
+++ b/Source/mesquite/trunk/AboutPanel.java
@@ -53,7 +53,7 @@ public void paint(Graphics g) {
g.drawImage(InfoBar.prereleaseImage,3,3,(ImageObserver)this);
}
g.drawString("http://www.mesquiteproject.org", 5,210);
- g.drawString("Copyright (c) 1997-2019 W. & D. Maddison.", 5,225);
+ g.drawString("Copyright (c) 1997-2021 W. & D. Maddison.", 5,225);
MesquiteWindow.uncheckDoomed(this);
}
diff --git a/Source/mesquite/trunk/PhoneHomeThread.java b/Source/mesquite/trunk/PhoneHomeThread.java
index 85a0d27f6..17bf939b0 100644
--- a/Source/mesquite/trunk/PhoneHomeThread.java
+++ b/Source/mesquite/trunk/PhoneHomeThread.java
@@ -46,6 +46,12 @@ public void run() {
}
}
}
+
+ String contactMessage = "";
+ public void setContactMessage(String contactMessage) {
+ this.contactMessage = contactMessage;
+ }
+
public void postBean(NameValuePair[] pairs){
beans.addElement(pairs);
}
@@ -59,6 +65,8 @@ public void checkForMessagesFromAllHomes(){
String buildNum = Integer.toString(MesquiteTrunk.getBuildNumber());
if (MesquiteTrunk.mesquiteTrunk.isPrerelease())
buildNum = "PreRelease-" + buildNum;
+ if (contactMessage != null)
+ buildNum += "&" + contactMessage;
BaseHttpRequestMaker.contactServer(buildNum, MesquiteModule.versionReportURL, response);
String r = response.toString();
//if mq3rs is included in response, then this is real response
diff --git a/Source/start/Mesquite.java b/Source/start/Mesquite.java
index f9ca41143..98380648e 100644
--- a/Source/start/Mesquite.java
+++ b/Source/start/Mesquite.java
@@ -64,6 +64,7 @@ void startMesquite(String args[]){
ClassLoader cl = start.Mesquite.class.getClassLoader();
String loc = cl.getResource("start/Mesquite.class").getPath();
System.out.println("Starting Mesquite with Java: " + System.getProperty("java.version"));
+
startupNotices.addElement("start.Mesquite: Location of executable start class: " + loc);
if (loc.startsWith("file:")){
diff --git a/docs/Acknowledgements.html b/docs/Acknowledgements.html
index 3c9c061e5..ea6a56fd8 100644
--- a/docs/Acknowledgements.html
+++ b/docs/Acknowledgements.html
@@ -41,8 +41,8 @@
Mesquite |
Acknowledgements |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -235,7 +235,7 @@ Acknowledgements
diff --git a/docs/Additional Mesquite Packages.html b/docs/Additional Mesquite Packages.html
index 498e60bad..f1826451d 100644
--- a/docs/Additional Mesquite Packages.html
+++ b/docs/Additional Mesquite Packages.html
@@ -41,8 +41,8 @@
Mesquite |
Additional Packages |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -290,7 +290,7 @@
diff --git a/docs/Align.html b/docs/Align.html
index 25688ea1d..47d4e173a 100644
--- a/docs/Align.html
+++ b/docs/Align.html
@@ -41,8 +41,8 @@
Mesquite |
Sequence Alignment |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -327,7 +327,7 @@ Citation
diff --git a/docs/Analyzing Continuous Characters.html b/docs/Analyzing Continuous Characters.html
index 5e5098ebe..0245a49b5 100644
--- a/docs/Analyzing Continuous Characters.html
+++ b/docs/Analyzing Continuous Characters.html
@@ -41,8 +41,8 @@
Mesquite |
Continuous characters |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -227,7 +227,7 @@
diff --git a/docs/Analyzing Molecular Data.html b/docs/Analyzing Molecular Data.html
index f7333722f..9b8c74ede 100644
--- a/docs/Analyzing Molecular Data.html
+++ b/docs/Analyzing Molecular Data.html
@@ -41,8 +41,8 @@
Mesquite |
Molecular Data |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -263,7 +263,7 @@
diff --git a/docs/Ancestral States.html b/docs/Ancestral States.html
index db36c211f..0f71da2ad 100644
--- a/docs/Ancestral States.html
+++ b/docs/Ancestral States.html
@@ -41,8 +41,8 @@
Mesquite |
Ancestral States |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -327,7 +327,7 @@
diff --git a/docs/Are strepsipterans related to flies.html b/docs/Are strepsipterans related to flies.html
index 0001f76a5..c9939b205 100644
--- a/docs/Are strepsipterans related to flies.html
+++ b/docs/Are strepsipterans related to flies.html
@@ -41,8 +41,8 @@
Mesquite |
Hypothesis testing |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -285,7 +285,7 @@
diff --git a/docs/Beginning Mesquite.html b/docs/Beginning Mesquite.html
index 8f9afa6e2..42ef85ea0 100644
--- a/docs/Beginning Mesquite.html
+++ b/docs/Beginning Mesquite.html
@@ -41,8 +41,8 @@
Mesquite |
Beginning Mesquite |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -212,7 +212,7 @@ Beginning Mesquite
diff --git a/docs/Bugs and Troubleshooting.html b/docs/Bugs and Troubleshooting.html
index 888118108..1b289792f 100644
--- a/docs/Bugs and Troubleshooting.html
+++ b/docs/Bugs and Troubleshooting.html
@@ -41,8 +41,8 @@
Mesquite |
Bugs and Troubleshooting |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -205,14 +205,11 @@ Bugs and Troubleshooting
Small text in Mesquite on Windows
There is a bug in some versions of Java which causes applications like Mesquite to show text (including that for Windows) in font that is extremely small. If you have this problem, do the following:
-
Right-click on the Mesquite.exe icon, and choose Properties. The following instructions are for Windows 10; you will need to find the equivalent for other Windows versions. In the Properties dialog box, go to the Compatibility tab. Touch the "Change high DPI settings" button. In the dialog box that appears, check "Override high DPI scaling behavior.", and in the popup menu under "Scaling performed by:" choose "System". Press OK on this dialog, and then OK on the other dialog box.
-
-
- Mesquite under MacOS X 10.12 (Sierra)
- Under MacOS X Sierra, starting up versions of Mesquite prior to 3.2 may result in nothing more than the icon bouncing in the Dock a few times, then disappearing. That is, it won't start up. If you see this behaviour, try downloading the latest version of Mesquite, which should work. If it does not, please contact us.
+ Right-click on the Mesquite.exe icon, and choose Properties. The following instructions are for Windows 10; you will need to find the equivalent for other Windows versions. In the Properties dialog box, go to the Compatibility tab. Touch the "Change high DPI settings" button. In the dialog box that appears, check "Override high DPI scaling behavior.", and in the popup menu under "Scaling performed by:" choose "System". Press OK on this dialog, and then OK on the other dialog box
-
Why does <insert feature> not seem to work properly?
+
+ Why does <insert feature> not seem to work properly?
It could be that the feature in question is one whose operation you don't fully understand, or it could be that you have found a bug. Some bugs you may encounter will be bugs not in Mesquite but in the operating system or Java virtual machine (for example, see the list, below).
@@ -257,7 +254,7 @@
diff --git a/docs/Character Evolution.html b/docs/Character Evolution.html
index 1ecf1abf9..cda37e898 100644
--- a/docs/Character Evolution.html
+++ b/docs/Character Evolution.html
@@ -41,8 +41,8 @@
Mesquite |
Character Evolution |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -208,7 +208,7 @@ Character Evolution
diff --git a/docs/Characters & Matrices.html b/docs/Characters & Matrices.html
index 09acee7ed..e6277a699 100644
--- a/docs/Characters & Matrices.html
+++ b/docs/Characters & Matrices.html
@@ -41,8 +41,8 @@
Mesquite |
Characters & Matrices |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -402,7 +402,7 @@ How Characte
diff --git a/docs/Charts.html b/docs/Charts.html
index d322b21fc..34aca9ffc 100644
--- a/docs/Charts.html
+++ b/docs/Charts.html
@@ -41,8 +41,8 @@
Mesquite |
Charts |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -255,7 +255,7 @@
diff --git a/docs/Contact Us.html b/docs/Contact Us.html
index a80cd0478..2cbc58d45 100644
--- a/docs/Contact Us.html
+++ b/docs/Contact Us.html
@@ -41,8 +41,8 @@
Mesquite |
Contact Us |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -208,7 +208,7 @@ Contact Us
diff --git a/docs/Developers Documentation.html b/docs/Developers Documentation.html
index 2d3824c66..7cb640b5b 100644
--- a/docs/Developers Documentation.html
+++ b/docs/Developers Documentation.html
@@ -41,8 +41,8 @@
Mesquite |
Developer's Documentation |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -209,7 +209,7 @@ Developer's documentation<
diff --git a/docs/Developers Reference.html b/docs/Developers Reference.html
index 049717230..a4a4c4868 100644
--- a/docs/Developers Reference.html
+++ b/docs/Developers Reference.html
@@ -41,8 +41,8 @@
Mesquite |
Developer's Reference |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -208,7 +208,7 @@ Developer's Reference
diff --git a/docs/Development Team.html b/docs/Development Team.html
index d2b6e5c23..715129632 100644
--- a/docs/Development Team.html
+++ b/docs/Development Team.html
@@ -41,8 +41,8 @@
Mesquite |
Development Team |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -220,7 +220,7 @@ The Development Team
diff --git a/docs/Diversification.html b/docs/Diversification.html
index 44141c1e3..9635924c4 100644
--- a/docs/Diversification.html
+++ b/docs/Diversification.html
@@ -41,8 +41,8 @@
Mesquite |
Diversification |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -241,7 +241,7 @@
diff --git a/docs/Documenting Your Work.html b/docs/Documenting Your Work.html
index f77d92553..a8fb5b0c1 100644
--- a/docs/Documenting Your Work.html
+++ b/docs/Documenting Your Work.html
@@ -41,8 +41,8 @@
Mesquite |
Documenting Your Work |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -219,7 +219,7 @@
diff --git a/docs/Example Files.html b/docs/Example Files.html
index 6a2dd26ce..15293fe56 100644
--- a/docs/Example Files.html
+++ b/docs/Example Files.html
@@ -41,8 +41,8 @@
Mesquite |
Example Files |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -214,7 +214,7 @@ Example Files
diff --git a/docs/FAQ.html b/docs/FAQ.html
index 67bba4377..5845d97ad 100644
--- a/docs/FAQ.html
+++ b/docs/FAQ.html
@@ -41,8 +41,8 @@
Mesquite |
FAQ |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -224,7 +224,7 @@
diff --git a/docs/Files.html b/docs/Files.html
index 77b27f631..4c689c21b 100644
--- a/docs/Files.html
+++ b/docs/Files.html
@@ -41,8 +41,8 @@
Mesquite |
Files |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -249,7 +249,7 @@
diff --git a/docs/Gene Trees.html b/docs/Gene Trees.html
index c0c6fc913..92411f18b 100644
--- a/docs/Gene Trees.html
+++ b/docs/Gene Trees.html
@@ -41,8 +41,8 @@
Mesquite |
Gene Trees |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -320,7 +320,7 @@
diff --git a/docs/Getting Help.html b/docs/Getting Help.html
index 09f34d12d..ddfe5fb2d 100644
--- a/docs/Getting Help.html
+++ b/docs/Getting Help.html
@@ -41,8 +41,8 @@
Mesquite |
Getting Help |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -211,7 +211,7 @@ Getting Help
diff --git a/docs/Glossary.html b/docs/Glossary.html
index ceeb828f5..bdc040d01 100644
--- a/docs/Glossary.html
+++ b/docs/Glossary.html
@@ -41,8 +41,8 @@
Mesquite |
Glossary |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -213,7 +213,7 @@
diff --git a/docs/History of Mesquite.html b/docs/History of Mesquite.html
index 09678edca..4e5fbcb1d 100644
--- a/docs/History of Mesquite.html
+++ b/docs/History of Mesquite.html
@@ -41,8 +41,8 @@
Mesquite |
History of Mesquite |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -216,7 +216,7 @@ History of Mesquite
diff --git a/docs/History of New Features.html b/docs/History of New Features.html
index f01d6b012..8cc752416 100644
--- a/docs/History of New Features.html
+++ b/docs/History of New Features.html
@@ -41,8 +41,8 @@
Mesquite |
History of New Features |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -207,16 +207,28 @@ Features to come in the next release version of Mesquite are listed on this web page. These new features and bug fixes are already contained in latest source code in the development branch of the MesquiteProject/MesquiteCore repository on GitHub.
-
- Next Version
+
+
+ Version 3.70
New Features
- - None yet
+ - You can now scroll from matrix to matrix in the Character Matrix Editor using the Next Matrix and Previous Matrix menu items. This is especially useful for genomic datasets with separate alignments, to scroll from locus to locus.
+ - Option to only consider taxon in common when using the Tree Congruent with Specified Tree Topology feature.
+ - Added Terminal Branch Length as a number for taxa.
Bug Fixes and Workarounds
- - None yet
+ - New systems for starting Mesquite on various newer operating systems and newer versions of Java created.
+ - Export for MrBayes no longer generates two competing "currentPartition" partitions that would cause MrBayes to stop execution.
+- The OTU ID Code database code now correctly processes the path to the database. A bug was introduced into 3.61 that prevented proper processing in many cases, which led to failure to export correct FASTA files for use with tbl2asn for GenBank submission using Chromaseq.
+ - NEXUS with protein data sometimes were sometimes written incorrectly.
+ - TNT files did not have the character and state label information written.
+- Miscellaneous small bugs fixed.
+ Known bugs
+
+ - A bug in Oracle Java for Linux versions 11-16 causes a StackOverflowError at startup. Until we find a workaround, please use Java 8 on Linux.
+
Version 3.61
New Features
@@ -504,7 +516,7 @@ If you have a previous version, please update because of bug fixes and new features.
Mesquite is modular, extendible software for evolutionary biology, designed to help biologists organize and analyze comparative data about organisms. Its emphasis is on phylogenetic analysis, but some of its modules concern population genetics, while others do non-phylogenetic multivariate analysis. Because it is modular, the analyses available depend on the modules installed.
Note: if you are running on Windows, and the text of menus and other elements is too small, then see the Bugs and Troubleshooting page for information about a fix.
- Note: if you are running on macOS, Mesquite will probably not function under Java 11. We suggest you stay with Java 8.
+ Note: The problems with starting Mesquite under MacOS X 10.15 (Catalina) have been fixed (see the Installation) page. In addition, the problems opening up the MacOS X .dmg file under older versions of the MacOS have also been fixed.
Use the menus at left to explore. Some good starting points are:
- Introduction to Mesquite
@@ -224,7 +224,7 @@
diff --git a/docs/space.menu.html b/docs/space.menu.html
index 284050eff..d9d16ba75 100644
--- a/docs/space.menu.html
+++ b/docs/space.menu.html
@@ -41,8 +41,8 @@
Mesquite |
|
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -217,7 +217,7 @@ Overview of Mesquite
diff --git a/docs/whyMesquite.html b/docs/whyMesquite.html
index dc0e1cf07..d1ca5f831 100644
--- a/docs/whyMesquite.html
+++ b/docs/whyMesquite.html
@@ -41,8 +41,8 @@
Mesquite |
Why Mesquite? |
|
- Version 3.61
- 26 December 2019
|
+ Version 3.70
+ August 2021
|
@@ -249,7 +249,7 @@ References
diff --git a/jars/commons-codec-1.11.jar b/jars/commons-codec-1.11.jar
new file mode 100644
index 000000000..22451206d
Binary files /dev/null and b/jars/commons-codec-1.11.jar differ
diff --git a/jars/commons-codec-1.6.jar b/jars/commons-codec-1.6.jar
deleted file mode 100755
index ee1bc49ac..000000000
Binary files a/jars/commons-codec-1.6.jar and /dev/null differ
diff --git a/jars/commons-io-2.11.0.jar b/jars/commons-io-2.11.0.jar
new file mode 100644
index 000000000..be507d94f
Binary files /dev/null and b/jars/commons-io-2.11.0.jar differ
diff --git a/jars/commons-io-2.5.jar b/jars/commons-io-2.5.jar
deleted file mode 100644
index 123491827..000000000
Binary files a/jars/commons-io-2.5.jar and /dev/null differ
diff --git a/jars/commons-lang-2.3.jar b/jars/commons-lang-2.3.jar
deleted file mode 100644
index c33b3537b..000000000
Binary files a/jars/commons-lang-2.3.jar and /dev/null differ
diff --git a/jars/commons-lang3-3.12.0.jar b/jars/commons-lang3-3.12.0.jar
new file mode 100644
index 000000000..4d434a2a4
Binary files /dev/null and b/jars/commons-lang3-3.12.0.jar differ
diff --git a/jars/commons-lang3-3.5.jar b/jars/commons-lang3-3.5.jar
deleted file mode 100644
index 6328c8de4..000000000
Binary files a/jars/commons-lang3-3.5.jar and /dev/null differ
diff --git a/jars/commons-logging-1.1.3.jar b/jars/commons-logging-1.1.3.jar
deleted file mode 100644
index ab5125407..000000000
Binary files a/jars/commons-logging-1.1.3.jar and /dev/null differ
diff --git a/jars/commons-logging-1.2.jar b/jars/commons-logging-1.2.jar
new file mode 100644
index 000000000..93a3b9f6d
Binary files /dev/null and b/jars/commons-logging-1.2.jar differ
diff --git a/jars/dom4j-2.0.2.jar b/jars/dom4j-2.0.2.jar
deleted file mode 100644
index 7039b80cc..000000000
Binary files a/jars/dom4j-2.0.2.jar and /dev/null differ
diff --git a/jars/dom4j-2.1.3.jar b/jars/dom4j-2.1.3.jar
new file mode 100644
index 000000000..9a4f5d273
Binary files /dev/null and b/jars/dom4j-2.1.3.jar differ
diff --git a/jars/httpclient-4.3.6.jar b/jars/httpclient-4.3.6.jar
deleted file mode 100644
index 091498c96..000000000
Binary files a/jars/httpclient-4.3.6.jar and /dev/null differ
diff --git a/jars/httpclient-4.5.13.jar b/jars/httpclient-4.5.13.jar
new file mode 100644
index 000000000..218ee25f2
Binary files /dev/null and b/jars/httpclient-4.5.13.jar differ
diff --git a/noticesAndUpdates/notices.xml b/noticesAndUpdates/notices.xml
index 769b1f01b..bd5661c74 100644
--- a/noticesAndUpdates/notices.xml
+++ b/noticesAndUpdates/notices.xml
@@ -1,17 +1,25 @@
- 24
+ 25
1
- 3.61
- 927
- 361
+ 3.70
+ 940
+ 370
http://www.mesquiteproject.org/Installation.html
+
+ 361
+ 26
+ alert
+ here]]>
+
360
- 25
+ 26
alert
351
- 25
+ 26
alert
350
- 25
+ 26
alert
340
- 25
+ 26
alert
the website.
@@ -44,7 +52,7 @@
331
- 25
+ 26
alert
the website.
@@ -53,7 +61,7 @@
330
- 25
+ 26
alert
the website.
@@ -62,7 +70,7 @@
330
- 25
+ 26
alert
the website.
@@ -71,7 +79,7 @@
201
- 25
+ 26
alert
This notice is to inform you that Mesquite now checks its web site for notices to users (such as this one) when it starts up. This should not cause a delay (if it does, please inform us). We anticipate notices will be given rarely, when there is an update available or an important bug to tell you about.