From 3db9cbf67645caca8cd9ef4a921603751084c483 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:50:24 +0100 Subject: gnu: r-desolve: Update to 1.25. * gnu/packages/maths.scm (r-desolve): Update to 1.25. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 32608ea2ff..29a1bfd768 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4408,14 +4408,13 @@ are noisy or are discontinuous at the solution.") (define-public r-desolve (package (name "r-desolve") - (version "1.24") + (version "1.25") (source (origin (method url-fetch) (uri (cran-uri "deSolve" version)) (sha256 - (base32 - "0hkvspq0fp8j64l9zayab2l2nazazhwfgfym0jllh0xv5a12r99s")))) + (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) (properties `((upstream-name . "deSolve"))) (build-system r-build-system) (native-inputs -- cgit v1.2.3 From ec9a15c2eb7aa6cf0ba9784d666dfa9419328e7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Nov 2019 01:51:35 +0100 Subject: gnu: r-quadprog: Update to 1.5-8. * gnu/packages/maths.scm (r-quadprog): Update to 1.5-8. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 29a1bfd768..e96a3199ff 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2345,14 +2345,13 @@ sparse system of linear equations A x = b using Gaussian elimination.") (define-public r-quadprog (package (name "r-quadprog") - (version "1.5-7") + (version "1.5-8") (source (origin (method url-fetch) (uri (cran-uri "quadprog" version)) (sha256 - (base32 - "0vg7i9p241bwvfdspjbydjrsvgipl6nsb8bjigp0hbbgvxbixx0s")))) + (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) (build-system r-build-system) (native-inputs `(("gfortran" ,gfortran))) -- cgit v1.2.3 From 1e8609f2387905c06c42d0efe9d08391ca9354ea Mon Sep 17 00:00:00 2001 From: Kei Kebreau Date: Sat, 23 Nov 2019 15:33:14 -0500 Subject: gnu: wxmaxima: Update to 19.11.1. * gnu/packages/maths.scm (wxmaxima): Update to 19.11.1. --- gnu/packages/maths.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e96a3199ff..83ff9919ad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2991,7 +2991,7 @@ point numbers.") (define-public wxmaxima (package (name "wxmaxima") - (version "19.09.0") + (version "19.11.1") (source (origin (method git-fetch) @@ -3000,7 +3000,7 @@ point numbers.") (commit (string-append "Version-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "195j6j8z0jd6xg3a63ywbrbsc6dany795m3fb95nbx1vq0bqqvvn")))) + (base32 "16xizaddb27432n1083y89ir5zdqvllsgbwrzzk4jc2rw1ldxfsv")))) (build-system cmake-build-system) (native-inputs `(("gettext" ,gettext-minimal))) -- cgit v1.2.3 From 0eb59d9eac63068f382cf3fe6c0d4dd867c6256c Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 17:59:25 +0100 Subject: gnu: r-quadprog: Move to (gnu packages cran). * gnu/packages/maths.scm (r-quadprog): Move from here... * gnu/packages/cran.scm (r-quadprog): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 20 ++++++++++++++++++++ gnu/packages/maths.scm | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 29aef19659..62113ab7e0 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15741,3 +15741,23 @@ unique identifiers, and whether it is a certain length. In addition, files and to efficiently import multiple tabular data files into one data.table.") (license license:gpl3))) + +(define-public r-quadprog + (package + (name "r-quadprog") + (version "1.5-8") + (source + (origin + (method url-fetch) + (uri (cran-uri "quadprog" version)) + (sha256 + (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/quadprog") + (synopsis "Functions to solve quadratic programming problems") + (description + "This package contains routines and documentation for solving quadratic +programming problems.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 83ff9919ad..cf78d0b7a4 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2342,26 +2342,6 @@ sparse system of linear equations A x = b using Gaussian elimination.") (inputs (alist-delete "pt-scotch" (package-inputs mumps-openmpi))))) -(define-public r-quadprog - (package - (name "r-quadprog") - (version "1.5-8") - (source - (origin - (method url-fetch) - (uri (cran-uri "quadprog" version)) - (sha256 - (base32 "1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2")))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://cran.r-project.org/web/packages/quadprog") - (synopsis "Functions to solve quadratic programming problems") - (description - "This package contains routines and documentation for solving quadratic -programming problems.") - (license license:gpl3+))) - (define-public r-pracma (package (name "r-pracma") -- cgit v1.2.3 From 9bd56b1a77e7011a044e9da6d4f7a00226eb01e0 Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:04:18 +0100 Subject: gnu: r-desolve: Move to (gnu packages cran). * gnu/packages/maths.scm (r-desolve): Move from here... * gnu/packages/cran.scm (r-desolve): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 28 ++++++++++++++++++++++++++++ gnu/packages/maths.scm | 28 ---------------------------- 2 files changed, 28 insertions(+), 28 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 62113ab7e0..943cd0deec 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15761,3 +15761,31 @@ data.table.") "This package contains routines and documentation for solving quadratic programming problems.") (license license:gpl3+))) + +(define-public r-desolve + (package + (name "r-desolve") + (version "1.25") + (source + (origin + (method url-fetch) + (uri (cran-uri "deSolve" version)) + (sha256 + (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) + (properties `((upstream-name . "deSolve"))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://desolve.r-forge.r-project.org/") + (synopsis "Solvers for initial value problems of differential equations") + (description "This package provides functions that solve initial +value problems of a system of first-order ordinary differential equations (ODE), +of partial differential equations (PDE), of differential algebraic equations +(DAE), and of delay differential equations. The functions provide an interface +to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK collection, +to the FORTRAN functions dvode and daspk and a C-implementation of solvers of +the Runge-Kutta family with fixed or variable time steps. The package contains +routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial +differential equations (PDE) that have been converted to ODEs by numerical +differencing.") + (license license:gpl2+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cf78d0b7a4..9108150de9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4384,34 +4384,6 @@ subspaces. The method is well suited for optimizing objective functions that are noisy or are discontinuous at the solution.") (license license:gpl3+))) -(define-public r-desolve - (package - (name "r-desolve") - (version "1.25") - (source - (origin - (method url-fetch) - (uri (cran-uri "deSolve" version)) - (sha256 - (base32 "0735y3p5glhqx69rzrc8qgmvs7p7w0p98qxmvylb6bgqp6kp0cbp")))) - (properties `((upstream-name . "deSolve"))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://desolve.r-forge.r-project.org/") - (synopsis "Solvers for initial value problems of differential equations") - (description "This package provides functions that solve initial -value problems of a system of first-order ordinary differential equations (ODE), -of partial differential equations (PDE), of differential algebraic equations -(DAE), and of delay differential equations. The functions provide an interface -to the FORTRAN functions lsoda, lsodar, lsode, lsodes of the ODEPACK collection, -to the FORTRAN functions dvode and daspk and a C-implementation of solvers of -the Runge-Kutta family with fixed or variable time steps. The package contains -routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial -differential equations (PDE) that have been converted to ODEs by numerical -differencing.") - (license license:gpl2+))) - (define-public tcalc (package (name "tcalc") -- cgit v1.2.3 From 682768deb036b730c25694adbd81cd1574b37dfd Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:07:02 +0100 Subject: gnu: r-pracma: Move to (gnu packages cran). * gnu/packages/maths.scm (r-pracma): Move from here... * gnu/packages/cran.scm (r-pracma): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 20 +++++++++++++++++++- gnu/packages/maths.scm | 18 ------------------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 943cd0deec..9a49602fff 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016, 2017 Ben Woodcroft -;;; Copyright © 2017, 2018 Roel Janssen +;;; Copyright © 2016, 2017, 2018 Roel Janssen ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Raoul Bonnal ;;; Copyright © 2018 Vijayalakshmi Vedantham @@ -15789,3 +15789,21 @@ routines designed for solving ODEs resulting from 1-D, 2-D and 3-D partial differential equations (PDE) that have been converted to ODEs by numerical differencing.") (license license:gpl2+))) + +(define-public r-pracma + (package + (name "r-pracma") + (version "2.2.5") + (source (origin + (method url-fetch) + (uri (cran-uri "pracma" version)) + (sha256 + (base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g")))) + (build-system r-build-system) + (home-page "https://cran.r-project.org/web/packages/pracma/") + (synopsis "Practical numerical math functions") + (description "This package provides functions for numerical analysis and +linear algebra, numerical optimization, differential equations, plus some +special functions. It uses Matlab function names where appropriate to simplify +porting.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9108150de9..c8e0e39343 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2342,24 +2342,6 @@ sparse system of linear equations A x = b using Gaussian elimination.") (inputs (alist-delete "pt-scotch" (package-inputs mumps-openmpi))))) -(define-public r-pracma - (package - (name "r-pracma") - (version "2.2.5") - (source (origin - (method url-fetch) - (uri (cran-uri "pracma" version)) - (sha256 - (base32 "0isd3s0i4mzmva8lkh0j76hwjy1w50q7d1n9lhxsnnkgalx3xs1g")))) - (build-system r-build-system) - (home-page "https://cran.r-project.org/web/packages/pracma/") - (synopsis "Practical numerical math functions") - (description "This package provides functions for numerical analysis and -linear algebra, numerical optimization, differential equations, plus some -special functions. It uses Matlab function names where appropriate to simplify -porting.") - (license license:gpl3+))) - (define-public ruby-asciimath (package (name "ruby-asciimath") -- cgit v1.2.3 From ef7944b94f38a1ed92f164ca6b37c8c9ad4bcbee Mon Sep 17 00:00:00 2001 From: zimoun Date: Wed, 27 Nov 2019 18:13:56 +0100 Subject: gnu: r-subplex: Move to (gnu packages cran). * gnu/packages/maths.scm (r-subplex): Move from here... * gnu/packages/cran.scm (r-subplex): ...to here. Signed-off-by: Ricardo Wurmus --- gnu/packages/cran.scm | 23 +++++++++++++++++++++++ gnu/packages/maths.scm | 22 ---------------------- 2 files changed, 23 insertions(+), 22 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9a49602fff..0797897acd 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -15807,3 +15807,26 @@ linear algebra, numerical optimization, differential equations, plus some special functions. It uses Matlab function names where appropriate to simplify porting.") (license license:gpl3+))) + +(define-public r-subplex + (package + (name "r-subplex") + (version "1.5-4") + (source + (origin + (method url-fetch) + (uri (cran-uri "subplex" version)) + (sha256 + (base32 + "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) + (build-system r-build-system) + (native-inputs + `(("gfortran" ,gfortran))) + (home-page "https://cran.r-project.org/web/packages/subplex") + (synopsis "Unconstrained optimization using the subplex algorithm") + (description + "This package implements the Subplex optimization algorithm. +It solves unconstrained optimization problems using a simplex method on +subspaces. The method is well suited for optimizing objective functions that +are noisy or are discontinuous at the solution.") + (license license:gpl3+))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c8e0e39343..16bb85efbc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4344,28 +4344,6 @@ analysed.") (arguments '(#:configure-flags '("-DMCRL2_ENABLE_GUI_TOOLS=OFF"))))) -(define-public r-subplex - (package - (name "r-subplex") - (version "1.5-4") - (source - (origin - (method url-fetch) - (uri (cran-uri "subplex" version)) - (sha256 - (base32 - "10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z")))) - (build-system r-build-system) - (native-inputs - `(("gfortran" ,gfortran))) - (home-page "https://cran.r-project.org/web/packages/subplex") - (synopsis "Unconstrained optimization using the subplex algorithm") - (description "This package implements the Subplex optimization algorithm. -It solves unconstrained optimization problems using a simplex method on -subspaces. The method is well suited for optimizing objective functions that -are noisy or are discontinuous at the solution.") - (license license:gpl3+))) - (define-public tcalc (package (name "tcalc") -- cgit v1.2.3 From f3640e7395b54c801bde8ba40ad08bdad488453d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 27 Nov 2019 18:29:32 +0100 Subject: gnu: Remove obsolete import of R build system module. * gnu/packages/maths.scm: Remove import of (guix build-system r). --- gnu/packages/maths.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 16bb85efbc..16e070eeff 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -62,7 +62,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (guix build-system r) #:use-module (guix build-system ruby) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) -- cgit v1.2.3