Browse code

adding Rcpp to namespace dependency

David Rasp authored on 01/04/2019 15:37:30
Showing 1 changed files
... ...
@@ -1,3 +1,4 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2 2
 useDynLib(Rdisop)
3 3
 export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,subMolecules)
4
+import(Rcpp)
4 5
\ No newline at end of file
Browse code

Moved from the ancient embedded Rcpp to RcppClassic thanks to the work of Dirk Eddelbuettel who did the porting

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@63004 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 23/02/2012 08:01:30
Showing 1 changed files
... ...
@@ -1,3 +1,3 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2 2
 useDynLib(Rdisop)
3
-export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,RcppVersion,subMolecules)
3
+export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,subMolecules)
Browse code

switched to static linking on 64bit linux

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49289 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 08/09/2010 09:27:14
Showing 1 changed files
... ...
@@ -1,4 +1,3 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2
-#useDynLib(libims)
3 2
 useDynLib(Rdisop)
4 3
 export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,RcppVersion,subMolecules)
Browse code

Intermediate commit moving from dynamic libs to static linking, works on win64

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@49287 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 08/09/2010 06:36:32
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2
-useDynLib(libims)
2
+#useDynLib(libims)
3 3
 useDynLib(Rdisop)
4 4
 export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,RcppVersion,subMolecules)
Browse code

Added scoreIsotopes, initializeCharges, fixed nasty alphabet bug

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@33178 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 11/08/2008 15:29:44
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2 2
 useDynLib(libims)
3 3
 useDynLib(Rdisop)
4
-export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,isotopeScore,RcppVersion,subMolecules)
4
+export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,initializeCharges,isotopeScore,RcppVersion,subMolecules)
Browse code

Fix linux build

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@28072 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 19/10/2007 09:19:01
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2
-#useDynLib(libims)
2
+useDynLib(libims)
3 3
 useDynLib(Rdisop)
4 4
 export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,isotopeScore,RcppVersion,subMolecules)
Browse code

More Fixes in Win Build

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@28010 bc3139a8-67e5-0310-9ffc-ced21a209358

s.neumann authored on 16/10/2007 10:50:54
Showing 1 changed files
... ...
@@ -1,4 +1,4 @@
1 1
 # echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2
-useDynLib(libims)
2
+#useDynLib(libims)
3 3
 useDynLib(Rdisop)
4 4
 export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,isotopeScore,RcppVersion,subMolecules)
Browse code

added the Rdisop package (2nd try)

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/Rdisop@27972 bc3139a8-67e5-0310-9ffc-ced21a209358

hpages@fhcrc.org authored on 12/10/2007 19:36:30
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,4 @@
1
+# echo "useDynLib(Rdisop)" ; echo -n "export(" ; grep --no-filename "<- function" R/*.R | cut -d" " -f 1 | grep -v First.lib | grep -v getElement | sort |  xargs echo -n | tr " " , ; echo ")"
2
+useDynLib(libims)
3
+useDynLib(Rdisop)
4
+export(addMolecules,decomposeIsotopes,decomposeMass,getMass,getFormula,getIsotope,getValid,getMolecule,getScore,initializeCHNOPS,initializeCHNOPSMgKCaFe,initializeCHNOPSNaK,initializeElements,initializePSE,isotopeScore,RcppVersion,subMolecules)