From b2c27efd68477d555452a7ab0725c2f5a51b3cfa Mon Sep 17 00:00:00 2001 From: alchemistmatt Date: Thu, 31 Jan 2019 18:31:13 -0800 Subject: [PATCH] Update the date, Readme, and Revision history --- Inferno/Forms/frmDAnTE.Main.cs | 2 +- README.md | 11 ++++------- RevisionHistory.txt | 4 ++++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Inferno/Forms/frmDAnTE.Main.cs b/Inferno/Forms/frmDAnTE.Main.cs index 6e53179..dde7d70 100644 --- a/Inferno/Forms/frmDAnTE.Main.cs +++ b/Inferno/Forms/frmDAnTE.Main.cs @@ -15,7 +15,7 @@ public partial class frmDAnTE : Form { #region Other Variables - public const string PROGRAM_DATE = "July 25, 2018"; + public const string PROGRAM_DATE = "January 31, 2019"; public const int SUGGESTED_DATASETS_TO_SELECT = 30; public const int MAX_DATASETS_TO_SELECT = 60; diff --git a/README.md b/README.md index 25cad1c..555661c 100644 --- a/README.md +++ b/README.md @@ -23,14 +23,11 @@ InfernoRDN uses R.NET (https://github.com/jmp75/rdotnet) to communicate with R. ## Installation -1. Download and install R 3.4.4 from - * https://cran.r-project.org/bin/windows/base/old/3.4.4/ - * Inferno does not work with R 3.5.x due to breaking changes the R developers made - * A fix to [R.NET is in progress](https://github.com/jmp75/rdotnet/issues/70) but is not yet available +1. Download and install R 3.5 or newer + * https://cran.r-project.org/bin/windows/base/ -2. Download the InfernoRDN installer from either of these sites: +2. Download the InfernoRDN installer from: * https://github.com/PNNL-Comp-Mass-Spec/InfernoRDN/releases - * https://omics.pnl.gov/software/infernordn 3. Run the installer, InfernoRDNSetup.exe @@ -62,7 +59,7 @@ InfernoRDN depends on the following: 1. Windows 7 (or newer) with the .NET 4.6 framework or newer * https://www.microsoft.com/en-us/download/details.aspx?id=53344 -2. R Statistical Environment, version 3.0 thrugh version 3.4 (not version 3.5.x) +2. R Statistical Environment, version 3.5 or newer * https://cran.r-project.org/bin/windows/base/ ### R Packages diff --git a/RevisionHistory.txt b/RevisionHistory.txt index eb6ae9b..5d5af3a 100644 --- a/RevisionHistory.txt +++ b/RevisionHistory.txt @@ -1,5 +1,9 @@ InfernoRDN Change Log +Version 1.1.6970; January 31, 2019 + - New RDotNet.dll that supports R 3.5 + - From rdotnet fork at https://github.com/StatTag/rdotnet + Version 1.1.6780; July 25, 2018 - Fix QRollup bug when enabling option "Include One-Hit-Wonders" - Proteins with only a single peptide will now have a score of 0