Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mlandis committed May 26, 2024
1 parent 49285c3 commit f3292d4
Show file tree
Hide file tree
Showing 215 changed files with 33,007 additions and 329 deletions.
20 changes: 10 additions & 10 deletions developer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,23 +96,23 @@ <h3 id="developers-guide">Developer’s Guide</h3>
</div>

<div class="tutorial">
<a class="title" href="/developer/automated_builds/"><p>Automated building and testing in RevBayes</p>
<a class="title" href="/developer/docker/"><p>Using Docker with RevBayes</p>
</a>
<p class="subtitle"><p>Quick automated feedback on code changes</p>
<p class="subtitle"><p>Containerized debugging and executeables</p>
</p>
</div>

<div class="tutorial">
<a class="title" href="/developer/best_practices/"><p>Best practices in RevBayes</p>
<a class="title" href="/developer/tests/"><p>Integration Tests in RevBayes</p>
</a>
<p class="subtitle"><p>Coding and documentation guidelines</p>
<p class="subtitle"><p>Ensuring that code changes did not unexpectedly alter the software</p>
</p>
</div>

<div class="tutorial">
<a class="title" href="/developer/docker/"><p>Using Docker with RevBayes</p>
<a class="title" href="/developer/tutorial/"><p>Contributing a RevBayes tutorial</p>
</a>
<p class="subtitle"><p>Containerized debugging and executeables</p>
<p class="subtitle"><p>How to write and host a tutorial on this website</p>
</p>
</div>

Expand All @@ -124,16 +124,16 @@ <h3 id="developers-guide">Developer’s Guide</h3>
</div>

<div class="tutorial">
<a class="title" href="/developer/tests/"><p>Integration Tests in RevBayes</p>
<a class="title" href="/developer/best_practices/"><p>Best practices in RevBayes</p>
</a>
<p class="subtitle"><p>Ensuring that code changes did not unexpectedly alter the software</p>
<p class="subtitle"><p>Coding and documentation guidelines</p>
</p>
</div>

<div class="tutorial">
<a class="title" href="/developer/tutorial/"><p>Contributing a RevBayes tutorial</p>
<a class="title" href="/developer/automated_builds/"><p>Automated building and testing in RevBayes</p>
</a>
<p class="subtitle"><p>How to write and host a tutorial on this website</p>
<p class="subtitle"><p>Quick automated feedback on code changes</p>
</p>
</div>

Expand Down
2 changes: 1 addition & 1 deletion developer/setup/eclipse.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<h1 class="maintitle">Setting up Eclipse for RevBayes development</h1>

<h4 class="authors"></h4>
<h5>Last modified on September 1, 2018</h5>
<h5>Last modified on August 31, 2018</h5>
</div>

<p>Eclipse is a Java-based, cross-platform IDE with lots of nice features that make it convenient for RevBayes development. First, it’s cross-platform, and unlike Xcode, you can use any compiler you like (not just <code class="language-plaintext highlighter-rouge">clang</code>).</p>
Expand Down
2 changes: 1 addition & 1 deletion developer/setup/netbeans.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<h1 class="maintitle"></h1>

<h4 class="authors"></h4>
<h5>Last modified on March 11, 2018</h5>
<h5>Last modified on March 10, 2018</h5>
</div>

<p>Conventions: File paths are relative to the repository root.</p>
Expand Down
2 changes: 1 addition & 1 deletion developer/setup/vim.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<h1 class="maintitle">Setting up vim for RevBayes development</h1>

<h4 class="authors"></h4>
<h5>Last modified on March 11, 2018</h5>
<h5>Last modified on March 10, 2018</h5>
</div>

<p><a href="http://www.vim.org">Vim</a> is a text editor that some people love.
Expand Down
2 changes: 1 addition & 1 deletion developer/tutorial/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<h1 class="maintitle">Contributing a RevBayes tutorial</h1>

<h4 class="authors"></h4>
<h5>Last modified on May 31, 2019</h5>
<h5>Last modified on May 30, 2019</h5>
</div>

<div class="sidebar no-print">
Expand Down
14 changes: 7 additions & 7 deletions tutorials/biogeo/biogeo_dating.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/main.css" />
<title>RevBayes: Biogeographic Dating of Divergence Times</title>
<title>RevBayes: Biogeographic dating using the DEC model</title>
</head>
<body>
<div class="container">
Expand Down Expand Up @@ -52,10 +52,10 @@
</nav>

<div class="titlebar">
<h1 class="maintitle">Biogeographic Dating of Divergence Times</h1>
<h3 class="subtitle">Estimating divergence times with molecular, biogeographic, and paleogeographic evidence under the Dispersal-Extirpation-Cladogenesis (DEC) model</h3>
<h1 class="maintitle">Biogeographic dating using the DEC model</h1>
<h3 class="subtitle">Estimating divergence times with molecular, biogeographic, and paleogeographic evidence with the DEC model</h3>
<h4 class="authors">Michael J. Landis</h4>
<h5>Last modified on February 28, 2022</h5>
<h5>Last modified on May 24, 2024</h5>
</div>


Expand All @@ -69,11 +69,11 @@ <h2>Overview</h2>

<ul id="prerequisites">

<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to Phylogenetic Models of Discrete Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to phylogenetic biogeography with the DEC model</a></li>

<li><a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a></li>

<li><a href="/tutorials/biogeo/biogeo_epoch.html">Advanced Phylogenetic Analysis of Historical Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_epoch.html">Advanced phylogenetic analysis using the DEC model</a></li>

</ul>

Expand Down
20 changes: 10 additions & 10 deletions tutorials/biogeo/biogeo_epoch.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/main.css" />
<title>RevBayes: Advanced Phylogenetic Analysis of Historical Biogeography</title>
<title>RevBayes: Advanced phylogenetic analysis using the DEC model</title>
</head>
<body>
<div class="container">
Expand Down Expand Up @@ -52,10 +52,10 @@
</nav>

<div class="titlebar">
<h1 class="maintitle">Advanced Phylogenetic Analysis of Historical Biogeography</h1>
<h3 class="subtitle">Ancestral range estimates using the Dispersal-Extirpation-Cladogenesis (DEC) model while incorporating time-dependent and region-dependent effects on dispersal rates</h3>
<h1 class="maintitle">Advanced phylogenetic analysis using the DEC model</h1>
<h3 class="subtitle">Ancestral range estimates using DEC with time- and region-dependent effects on dispersal rates</h3>
<h4 class="authors">Michael J. Landis</h4>
<h5>Last modified on March 9, 2022</h5>
<h5>Last modified on May 24, 2024</h5>
</div>


Expand All @@ -69,9 +69,9 @@ <h2>Overview</h2>

<ul id="prerequisites">

<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to Phylogenetic Models of Discrete Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to phylogenetic biogeography with the DEC model</a></li>

<li><a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a></li>

</ul>

Expand Down Expand Up @@ -172,7 +172,7 @@ <h2>Data files and scripts</h2>
<h2 class="section" id="intro">Introduction</h2>
<hr class="section" />

<p>In the <a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a> tutorial, we went through the exercise of setting up the
<p>In the <a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a> tutorial, we went through the exercise of setting up the
instantaneous rate matrix and cladogenetic transition probabilities for a simple
DEC model.
In this tutorial, we will set up a more complex model considering the geological histories in the biogeographic inference. We will learn how to set up an epoch model.</p>
Expand Down Expand Up @@ -285,7 +285,7 @@ <h2 class="section" id="bg_epoch">An improved DEC analysis</h2>
</tbody>
</table>

<figcaption class="table">Hawaiian paleogeographic data. The six areas are given in <a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a>.
<figcaption class="table">Hawaiian paleogeographic data. The six areas are given in <a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a>.
Ages $a_{max}$ and $a_{min}$ report the maximum
and minimum origination times for the given island [adapted from
<a class="citation" href="#Lim2017">(Lim and Marshall 2017)</a>]. Note that these ages are younger (less conservative) than the ages used in <a class="citation" href="#Landis2018">Landis et al. (2018)</a>. Distances $g_{ij}$ report the shortest geographical
Expand Down Expand Up @@ -571,7 +571,7 @@ <h3 class="subsection" id="results">Results</h3>
<p><strong>Example results are located at <code class="language-plaintext highlighter-rouge">output_example/epoch</code>.</strong></p>

<p>When compared to the ancestral state estimates from the “simple”
analysis (<a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a>), these results are far
analysis (<a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a>), these results are far
more consonant with what we understand about the origination times of
the islands (<a href="#paleogeo"></a>). First, this reconstruction asserts
that the clade originated in the modern Hawaiian islands at a time when
Expand All @@ -592,7 +592,7 @@ <h3 class="subsection" id="results">Results</h3>
</figure>

<blockquote class="instruction">
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_dating.html">Biogeographic Dating of Divergence Times</a></p>
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_dating.html">Biogeographic dating using the DEC model</a></p>
</blockquote>

<ol class="bibliography"><li><span id="Landis2018">Landis M.J., Freyman W.A., Baldwin B.G. 2018. Retracing the Hawaiian silversword radiation despite phylogenetic, biogeographic, and paleogeographic uncertainty. Evolution. 72:2343–2359.</span>
Expand Down
10 changes: 5 additions & 5 deletions tutorials/biogeo/biogeo_intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/main.css" />
<title>RevBayes: Introduction to Phylogenetic Models of Discrete Biogeography</title>
<title>RevBayes: Introduction to phylogenetic biogeography with the DEC model</title>
</head>
<body>
<div class="container">
Expand Down Expand Up @@ -52,10 +52,10 @@
</nav>

<div class="titlebar">
<h1 class="maintitle">Introduction to Phylogenetic Models of Discrete Biogeography</h1>
<h3 class="subtitle">Overview of the Dispersal-Extirpation-Cladogenesis (DEC) model</h3>
<h1 class="maintitle">Introduction to phylogenetic biogeography with the DEC model</h1>
<h3 class="subtitle">Overview of the Dispersal-Extinction-Cladogenesis (DEC) model</h3>
<h4 class="authors">Michael J. Landis and Sarah K. Swiston</h4>
<h5>Last modified on April 25, 2023</h5>
<h5>Last modified on May 24, 2024</h5>
</div>


Expand Down Expand Up @@ -460,7 +460,7 @@ <h3 class="subsection" id="things-to-consider">Things to Consider</h3>
itself.</p>

<blockquote class="instruction">
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_simple.html">Simple Phylogenetic Analysis of Historical Biogeography</a></p>
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_simple.html">Simple phylogenetic analysis using the DEC model</a></p>
</blockquote>

<ol class="bibliography"><li><span id="Landis2013a">Landis M.J., Matzke N.J., Moore B.R., Huelsenbeck J.P. 2013. Bayesian Analysis of Biogeography when the Number of Areas is Large. Systematic Biology. 62:789–804.</span>
Expand Down
12 changes: 6 additions & 6 deletions tutorials/biogeo/biogeo_simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/bootstrap-theme.css" />
<link rel="stylesheet" type="text/css" href="/assets/css/main.css" />
<title>RevBayes: Simple Phylogenetic Analysis of Historical Biogeography</title>
<title>RevBayes: Simple phylogenetic analysis using the DEC model</title>
</head>
<body>
<div class="container">
Expand Down Expand Up @@ -52,10 +52,10 @@
</nav>

<div class="titlebar">
<h1 class="maintitle">Simple Phylogenetic Analysis of Historical Biogeography</h1>
<h1 class="maintitle">Simple phylogenetic analysis using the DEC model</h1>
<h3 class="subtitle">Estimating ancestral ranges using the Dispersal-Extirpation-Cladogenesis (DEC) model</h3>
<h4 class="authors">Michael J. Landis</h4>
<h5>Last modified on February 28, 2022</h5>
<h5>Last modified on May 24, 2024</h5>
</div>


Expand All @@ -69,7 +69,7 @@ <h2>Overview</h2>

<ul id="prerequisites">

<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to Phylogenetic Models of Discrete Biogeography</a></li>
<li><a href="/tutorials/biogeo/biogeo_intro.html">Introduction to phylogenetic biogeography with the DEC model</a></li>

</ul>

Expand Down Expand Up @@ -156,7 +156,7 @@ <h2>Data files and scripts</h2>
<h2 class="section" id="intro">Introduction</h2>
<hr class="section" />

<p>In the <a href="/tutorials/biogeo/biogeo_intro.html">Introduction to Phylogenetic Models of Discrete Biogeography</a> tutorial, we went through the exercise of setting up the
<p>In the <a href="/tutorials/biogeo/biogeo_intro.html">Introduction to phylogenetic biogeography with the DEC model</a> tutorial, we went through the exercise of setting up the
instantaneous rate matrix and cladogenetic transition probabilities for a simple
DEC model.
In this tutorial, we will complete a biogeographic analysis using an empirical dataset: the Hawaiian silverswords.</p>
Expand Down Expand Up @@ -651,7 +651,7 @@ <h3 class="subsection" id="results_simple">Results</h3>
presented here.</p>

<blockquote class="instruction">
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_epoch.html">Advanced Phylogenetic Analysis of Historical Biogeography</a></p>
<p>Continue to the next tutorial: <a href="/tutorials/biogeo/biogeo_epoch.html">Advanced phylogenetic analysis using the DEC model</a></p>
</blockquote>

<ol class="bibliography"><li><span id="Baldwin1991">Baldwin B.G., Kyhos D.W., Dvorak J., Carr G.D. 1991. Chloroplast DNA evidence for a North American origin of the Hawaiian silversword alliance (Asteraceae). Proceedings of the National Academy of Sciences. 88:1840–1843.</span>
Expand Down
48 changes: 48 additions & 0 deletions tutorials/biogeo/old_stuff/plot_anc_range.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
stable = T
if (stable) {
library(RevGadgets)
} else {
source("/Users/mlandis/projects/RevGadgets/R/plot_ancestral_states.R")
}
library(ggtree)
library(ggplot2)

# files
tree_fn = paste(out_str, ".ase.tre", sep="")
label_fn = paste(out_str, ".state_labels.txt", sep="")
color_fn = "scripts/range_colors.txt"

# get state labels
state_descriptions = read.csv(label_fn, header=T, sep=",", colClasses="character")

# map presence-absence ranges to area names
range_labels = sapply(state_descriptions$range[2:nrow(state_descriptions)],
function(x) {
present = as.vector(gregexpr(pattern="1", x)[[1]])
paste( area_names[present], collapse="")
})

state_labels = range_labels
names(state_labels) = as.character(1:15)

# generate colors for ranges
range_color_list = read.csv(color_fn, header=T, sep=",", colClasses="character")
range_colors = range_color_list$color[ match(range_labels, range_color_list$range) ]

# plot ranges
summary_statistic = "MAPRange"
plot_ancestral_states(tree_file=tree_fn,
include_start_states=T,
shoulder_label_size=1.5,
shoulder_label_nudge_x=-0.1*plot_scale,
summary_statistic=summary_statistic,
state_labels=state_labels,
state_colors=range_colors,
node_label_size=2,
node_size_range=c(2,2),
node_label_nudge_x=0.1*plot_scale,
tip_label_size=2,
tip_label_offset=0.5*plot_scale,
xlim_visible=c(0,17*plot_scale),
show_posterior_legend=F,
show_tree_scale=T)
58 changes: 58 additions & 0 deletions tutorials/biogeo/old_stuff/plot_anc_range.n4.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
stable = T
if (stable) {
library(RevGadgets)
} else {
source("/Users/mlandis/projects/RevGadgets/R/plot_ancestral_states.R")
}
library(ggtree)



# area labels
out_str = "output/simple"
out_str = "output/epoch"
area_names = c("K", "O", "M", "H")
s = 5/15

out_str = "output/simple_phy"
area_names = c("R", "K", "O", "M", "H", "Z")
s =

tree_fn = paste(out_str, ".ase.tre", sep="")
label_fn = paste(out_str, ".state_labels.txt", sep="")
color_fn = "scripts/range_colors.txt"

# get state labels
state_descriptions = read.csv(label_fn, header=T, sep=",", colClasses="character")


# map presence-absence ranges to area names
range_labels = sapply(state_descriptions$range[2:nrow(state_descriptions)],
function(x) {
present = as.vector(gregexpr(pattern="1", x)[[1]])
paste( area_names[present], collapse="")
})

# generate colors for ranges
range_color_list = read.csv(color_fn, header=T, sep=",", colClasses="character")
range_colors = range_color_list$color[ match(range_labels, range_color_list$range) ]


# plot ranges
summary_statistic = "MAPRange"
s = 5 / 15
plot_ancestral_states(tree_file=tree_fn,
include_start_states=T,
shoulder_label_size=1.5,
shoulder_label_nudge_x=-0.1*s,
summary_statistic=summary_statistic,
state_labels=range_labels,
state_colors=range_colors,
node_label_size=2,
node_size_range=c(2,2),
node_label_nudge_x=0.1*s,
tip_label_size=2,
tip_label_offset=s*0.5,
xlim_visible=c(0,s*17),
show_posterior_legend=F,
show_tree_scale=T)
11 changes: 11 additions & 0 deletions tutorials/biogeo/old_stuff/range_colors.epoch.n4.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
range,color
"K","#7570b3"
"O","#e7298a"
"M","#66a61e"
"H","#e6ab02"
"KO","orchid"
"KM","red"
"OM","green"
"KH","cyan"
"OH","cadetblue3"
"MH","tomato"
Loading

0 comments on commit f3292d4

Please sign in to comment.