Skip to content

Commit 566e858

Browse files
mikesiodamsioda
mikesioda
authored and
msioda
committed
BioLockJ Release v0.9.2-beta (#52)
Bug fixes, module + property name changes. Docker scripts mid-progress.
1 parent 0d9ba2b commit 566e858

121 files changed

Lines changed: 2181 additions & 1868 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.9.1-beta
1+
v0.9.2-beta

‎docs/biolockj/module/r/BuildFoldChangePlots.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class BuildFoldChangePlots" class="title">Class BuildFoldChangePlots<
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.r.R_Module</a></li>
111+
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.report.r.R_Module</a></li>
112112
<li>
113113
<ul class="inheritance">
114114
<li>biolockj.module.r.BuildFoldChangePlots</li>

‎docs/biolockj/module/r/BuildMdsPlots.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class BuildMdsPlots" class="title">Class BuildMdsPlots</h2>
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.r.R_Module</a></li>
111+
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.report.r.R_Module</a></li>
112112
<li>
113113
<ul class="inheritance">
114114
<li>biolockj.module.r.BuildMdsPlots</li>

‎docs/biolockj/module/r/BuildOtuPlots.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class BuildOtuPlots" class="title">Class BuildOtuPlots</h2>
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.r.R_Module</a></li>
111+
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.report.r.R_Module</a></li>
112112
<li>
113113
<ul class="inheritance">
114114
<li>biolockj.module.r.BuildOtuPlots</li>

‎docs/biolockj/module/r/BuildPvalHistograms.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class BuildPvalHistograms" class="title">Class BuildPvalHistograms</h
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.r.R_Module</a></li>
111+
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.report.r.R_Module</a></li>
112112
<li>
113113
<ul class="inheritance">
114114
<li>biolockj.module.r.BuildPvalHistograms</li>

‎docs/biolockj/module/r/CalculateStats.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class CalculateStats" class="title">Class CalculateStats</h2>
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.r.R_Module</a></li>
111+
<li><a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">biolockj.module.report.r.R_Module</a></li>
112112
<li>
113113
<ul class="inheritance">
114114
<li>biolockj.module.r.CalculateStats</li>

‎docs/biolockj/module/r/R_Module.html‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ <h2 title="Class R_Module" class="title">Class R_Module</h2>
108108
<li><a href="../../../biolockj/module/ScriptModuleImpl.html" title="class in biolockj.module">biolockj.module.ScriptModuleImpl</a></li>
109109
<li>
110110
<ul class="inheritance">
111-
<li>biolockj.module.r.R_Module</li>
111+
<li>biolockj.module.report.r.R_Module</li>
112112
</ul>
113113
</li>
114114
</ul>
@@ -463,7 +463,7 @@ <h4>METHOD_REPORT_STATUS</h4>
463463
<div class="block">Method name in BioLockJ_Lib.R to report status of script: "reportStatus"</div>
464464
<dl>
465465
<dt><span class="seeLabel">See Also:</span></dt>
466-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.METHOD_REPORT_STATUS">Constant Field Values</a></dd>
466+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.METHOD_REPORT_STATUS">Constant Field Values</a></dd>
467467
</dl>
468468
</li>
469469
</ul>
@@ -477,7 +477,7 @@ <h4>METHOD_RUN_PROGRAM</h4>
477477
<div class="block">Method name in BioLockJ_Lib.R to run script program: "runProgram"</div>
478478
<dl>
479479
<dt><span class="seeLabel">See Also:</span></dt>
480-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.METHOD_RUN_PROGRAM">Constant Field Values</a></dd>
480+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.METHOD_RUN_PROGRAM">Constant Field Values</a></dd>
481481
</dl>
482482
</li>
483483
</ul>
@@ -491,7 +491,7 @@ <h4>MODULE_DIR</h4>
491491
<div class="block">This directory is added to the MAIN script: "moduleDir"</div>
492492
<dl>
493493
<dt><span class="seeLabel">See Also:</span></dt>
494-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.MODULE_DIR">Constant Field Values</a></dd>
494+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.MODULE_DIR">Constant Field Values</a></dd>
495495
</dl>
496496
</li>
497497
</ul>
@@ -505,7 +505,7 @@ <h4>R_DATA_EXT</h4>
505505
<div class="block">File extension for R save.image() command output: ".RData"</div>
506506
<dl>
507507
<dt><span class="seeLabel">See Also:</span></dt>
508-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_DATA_EXT">Constant Field Values</a></dd>
508+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_DATA_EXT">Constant Field Values</a></dd>
509509
</dl>
510510
</li>
511511
</ul>
@@ -519,7 +519,7 @@ <h4>R_EXT</h4>
519519
<div class="block">File extension of BioLockJ generated R Scripts: ".R"</div>
520520
<dl>
521521
<dt><span class="seeLabel">See Also:</span></dt>
522-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_EXT">Constant Field Values</a></dd>
522+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_EXT">Constant Field Values</a></dd>
523523
</dl>
524524
</li>
525525
</ul>
@@ -533,7 +533,7 @@ <h4>R_FUNCTION_GET_MOD_SCRIPT</h4>
533533
<div class="block">R function to get module script file path: "getModuleScript"</div>
534534
<dl>
535535
<dt><span class="seeLabel">See Also:</span></dt>
536-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_FUNCTION_GET_MOD_SCRIPT">Constant Field Values</a></dd>
536+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_FUNCTION_GET_MOD_SCRIPT">Constant Field Values</a></dd>
537537
</dl>
538538
</li>
539539
</ul>
@@ -547,7 +547,7 @@ <h4>R_FUNCTION_LIB</h4>
547547
<div class="block">This library script contains helper functions used in the R scripts: "BioLockJ_Lib.R"</div>
548548
<dl>
549549
<dt><span class="seeLabel">See Also:</span></dt>
550-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_FUNCTION_LIB">Constant Field Values</a></dd>
550+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_FUNCTION_LIB">Constant Field Values</a></dd>
551551
</dl>
552552
</li>
553553
</ul>
@@ -561,7 +561,7 @@ <h4>R_MAIN_SCRIPT</h4>
561561
<div class="block">This main R script that sources helper libraries and calls modules main method function: "BioLockJ_MAIN.R"</div>
562562
<dl>
563563
<dt><span class="seeLabel">See Also:</span></dt>
564-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_MAIN_SCRIPT">Constant Field Values</a></dd>
564+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_MAIN_SCRIPT">Constant Field Values</a></dd>
565565
</dl>
566566
</li>
567567
</ul>
@@ -575,7 +575,7 @@ <h4>R_SAVE_R_DATA</h4>
575575
<div class="block"><a href="../../../biolockj/Config.html" title="class in biolockj"><code>Config</code></a> boolean property "r.saveRData" enables the .RData file to save.</div>
576576
<dl>
577577
<dt><span class="seeLabel">See Also:</span></dt>
578-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_SAVE_R_DATA">Constant Field Values</a></dd>
578+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_SAVE_R_DATA">Constant Field Values</a></dd>
579579
</dl>
580580
</li>
581581
</ul>
@@ -589,7 +589,7 @@ <h4>EXE_RSCRIPT</h4>
589589
<div class="block"><a href="../../../biolockj/Config.html" title="class in biolockj"><code>Config</code></a> property "exe.Rscript" defines the command line executable to call RScript</div>
590590
<dl>
591591
<dt><span class="seeLabel">See Also:</span></dt>
592-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.EXE_RSCRIPT">Constant Field Values</a></dd>
592+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.EXE_RSCRIPT">Constant Field Values</a></dd>
593593
</dl>
594594
</li>
595595
</ul>
@@ -603,7 +603,7 @@ <h4>R_DEBUG</h4>
603603
<div class="block"><a href="../../../biolockj/Config.html" title="class in biolockj"><code>Config</code></a> boolean property "r.debug" sets the debug log function endabled</div>
604604
<dl>
605605
<dt><span class="seeLabel">See Also:</span></dt>
606-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_DEBUG">Constant Field Values</a></dd>
606+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_DEBUG">Constant Field Values</a></dd>
607607
</dl>
608608
</li>
609609
</ul>
@@ -617,7 +617,7 @@ <h4>R_PLOT_WIDTH</h4>
617617
<div class="block"><a href="../../../biolockj/Config.html" title="class in biolockj"><code>Config</code></a> Integer property "r.plotWidth" sets the plot width in the PDF reports.</div>
618618
<dl>
619619
<dt><span class="seeLabel">See Also:</span></dt>
620-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_PLOT_WIDTH">Constant Field Values</a></dd>
620+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_PLOT_WIDTH">Constant Field Values</a></dd>
621621
</dl>
622622
</li>
623623
</ul>
@@ -632,7 +632,7 @@ <h4>R_TIMEOUT</h4>
632632
timeout. If undefined, no timeout is used.</div>
633633
<dl>
634634
<dt><span class="seeLabel">See Also:</span></dt>
635-
<dd><a href="../../../constant-values.html#biolockj.module.r.R_Module.R_TIMEOUT">Constant Field Values</a></dd>
635+
<dd><a href="../../../constant-values.html#biolockj.module.report.r.R_Module.R_TIMEOUT">Constant Field Values</a></dd>
636636
</dl>
637637
</li>
638638
</ul>

‎docs/biolockj/module/r/class-use/R_Module.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<html lang="en">
44
<head>
55
<!-- Generated by javadoc (1.8.0_144) on Tue Jan 08 16:37:36 EST 2019 -->
6-
<title>Uses of Class biolockj.module.r.R_Module</title>
6+
<title>Uses of Class biolockj.module.report.r.R_Module</title>
77
<meta name="date" content="2019-01-08">
88
<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
99
<script type="text/javascript" src="../../../../script.js"></script>
@@ -12,7 +12,7 @@
1212
<script type="text/javascript"><!--
1313
try {
1414
if (location.href.indexOf('is-external=true') == -1) {
15-
parent.document.title="Uses of Class biolockj.module.r.R_Module";
15+
parent.document.title="Uses of Class biolockj.module.report.r.R_Module";
1616
}
1717
}
1818
catch(err) {
@@ -72,7 +72,7 @@
7272
</a></div>
7373
<!-- ========= END OF TOP NAVBAR ========= -->
7474
<div class="header">
75-
<h2 title="Uses of Class biolockj.module.r.R_Module" class="title">Uses of Class<br>biolockj.module.r.R_Module</h2>
75+
<h2 title="Uses of Class biolockj.module.report.r.R_Module" class="title">Uses of Class<br>biolockj.module.report.r.R_Module</h2>
7676
</div>
7777
<div class="classUseContainer">
7878
<ul class="blockList">
@@ -178,7 +178,7 @@ <h3>Uses of <a href="../../../../biolockj/module/r/R_Module.html" title="class i
178178
<tbody>
179179
<tr class="altColor">
180180
<td class="colFirst"><code>protected static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
181-
<td class="colLast"><span class="typeNameLabel">DownloadUtil.</span><code><span class="memberNameLink"><a href="../../../../biolockj/util/DownloadUtil.html#getExts-biolockj.module.r.R_Module-">getExts</a></span>(<a href="../../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;module)</code>
181+
<td class="colLast"><span class="typeNameLabel">DownloadUtil.</span><code><span class="memberNameLink"><a href="../../../../biolockj/util/DownloadUtil.html#getExts-biolockj.module.report.r.R_Module-">getExts</a></span>(<a href="../../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;module)</code>
182182
<div class="block">Get file extensions for each R module to include in scp download command</div>
183183
</td>
184184
</tr>

‎docs/biolockj/util/DownloadUtil.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ <h3>Method Summary</h3>
180180
</tr>
181181
<tr id="i4" class="altColor">
182182
<td class="colFirst"><code>protected static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
183-
<td class="colLast"><code><span class="memberNameLink"><a href="../../biolockj/util/DownloadUtil.html#getExts-biolockj.module.r.R_Module-">getExts</a></span>(<a href="../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;module)</code>
183+
<td class="colLast"><code><span class="memberNameLink"><a href="../../biolockj/util/DownloadUtil.html#getExts-biolockj.module.report.r.R_Module-">getExts</a></span>(<a href="../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;module)</code>
184184
<div class="block">Get file extensions for each R module to include in scp download command</div>
185185
</td>
186186
</tr>
@@ -309,7 +309,7 @@ <h4>getDownloadModules</h4>
309309
</dl>
310310
</li>
311311
</ul>
312-
<a name="getExts-biolockj.module.r.R_Module-">
312+
<a name="getExts-biolockj.module.report.r.R_Module-">
313313
<!-- -->
314314
</a>
315315
<ul class="blockList">

‎docs/biolockj/util/r/BaseScript.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ <h3>Constructor Summary</h3>
192192
</tr>
193193
<tr class="altColor">
194194
<td class="colFirst"><code>protected </code></td>
195-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#BaseScript-biolockj.module.r.R_Module-">BaseScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
195+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#BaseScript-biolockj.module.report.r.R_Module-">BaseScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
196196
<div class="block">This method generates the base script R code required by all standard R modules.</div>
197197
</td>
198198
</tr>
@@ -213,7 +213,7 @@ <h3>Method Summary</h3>
213213
</tr>
214214
<tr id="i0" class="altColor">
215215
<td class="colFirst"><code>static void</code></td>
216-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#buildScript-biolockj.module.r.R_Module-">buildScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
216+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#buildScript-biolockj.module.report.r.R_Module-">buildScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
217217
<div class="block">This method constructs a new BaseScript for the given rModule.</div>
218218
</td>
219219
</tr>
@@ -225,7 +225,7 @@ <h3>Method Summary</h3>
225225
</tr>
226226
<tr id="i2" class="altColor">
227227
<td class="colFirst"><code>static <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
228-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#getScriptPath-biolockj.module.r.R_Module-">getScriptPath</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
228+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#getScriptPath-biolockj.module.report.r.R_Module-">getScriptPath</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
229229
<div class="block">Return the path to the base script.</div>
230230
</td>
231231
</tr>
@@ -256,7 +256,7 @@ <h3>Method Summary</h3>
256256
</tr>
257257
<tr id="i7" class="rowColor">
258258
<td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
259-
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#rLinesInitScript-biolockj.module.r.R_Module-">rLinesInitScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
259+
<td class="colLast"><code><span class="memberNameLink"><a href="../../../biolockj/util/r/BaseScript.html#rLinesInitScript-biolockj.module.report.r.R_Module-">rLinesInitScript</a></span>(<a href="../../../biolockj/module/r/R_Module.html" title="class in biolockj.module.r">R_Module</a>&nbsp;rModule)</code>
260260
<div class="block">Initialize script, set directories at top of script to make it easy for users to update later.</div>
261261
</td>
262262
</tr>
@@ -352,7 +352,7 @@ <h4>FUNCTION_GET_VALS_BY_NAME</h4>
352352
<!-- -->
353353
</a>
354354
<h3>Constructor Detail</h3>
355-
<a name="BaseScript-biolockj.module.r.R_Module-">
355+
<a name="BaseScript-biolockj.module.report.r.R_Module-">
356356
<!-- -->
357357
</a>
358358
<ul class="blockListLast">
@@ -468,7 +468,7 @@ <h4>rFunctionGetValuesByName</h4>
468468
</dl>
469469
</li>
470470
</ul>
471-
<a name="rLinesInitScript-biolockj.module.r.R_Module-">
471+
<a name="rLinesInitScript-biolockj.module.report.r.R_Module-">
472472
<!-- -->
473473
</a>
474474
<ul class="blockList">
@@ -504,7 +504,7 @@ <h4>rLinesSetLists</h4>
504504
</dl>
505505
</li>
506506
</ul>
507-
<a name="buildScript-biolockj.module.r.R_Module-">
507+
<a name="buildScript-biolockj.module.report.r.R_Module-">
508508
<!-- -->
509509
</a>
510510
<ul class="blockList">
@@ -537,7 +537,7 @@ <h4>convertToString</h4>
537537
</dl>
538538
</li>
539539
</ul>
540-
<a name="getScriptPath-biolockj.module.r.R_Module-">
540+
<a name="getScriptPath-biolockj.module.report.r.R_Module-">
541541
<!-- -->
542542
</a>
543543
<ul class="blockListLast">

0 commit comments

Comments
 (0)