As I discussed here, git allows you to commit only some of the changes you made to a given file. If you are working in Emacs you probably already know the wonders of Magit. In order to do the same partial committing of a file you can simply open magit-status and go to the file you’re interested in. This will highlight the changed parts of the text. With your cursor in the changed block you’d like to commit simply press
Lennart's weblog
Open source, computers, Africa and other more (or less) interesting stuff.
Category: Programming (page 1 of 3)
This morning version 0.9-6 of the DatABEL R package was published on CRAN. This is only a minor update that consists of a few small changes and one bug fix. See the official announcement for more information.
DatABEL is an R package that allows users to access files with large matrices (of several gigabytes or more in size) in a fast and efficient manner. The package is mainly used for genome-wide association analyses using e.g. ProbABEL or OmicABEL.
If you only want to commit some of the changes to a file in a Git repository, use
git add --patch your_changed_file |
This will interactively ask you which lines to keep:
$ git add --patch .emacs diff --git a/.emacs b/.emacs index d903495..5a0eb9e 100644 --- a/.emacs +++ b/.emacs @@ -69,9 +69,9 @@ ;;; Make better buffer names when opening files with the same name -(when (autoload 'uniquify "uniquify" "uniquify" t) +(when (require 'uniquify nil 'noerror) (setq uniquify-buffer-name-style 'post-forward-angle-brackets) - ) +) Stage this hunk [y,n,q,a,d,/,K,j,J,g,s,e,?]? |
Source and more information on StackOverflow.com.
A quick note to self: I wanted to find out what Subversion version was run on R-forge, which I access via SSH. This is how to do it:
$ ssh username@svn.r-forge.r-project.org svnserve --version svnserve, version 1.6.17 (r1128011) compiled Nov 20 2011, 01:10:33 Copyright (C) 2000-2009 CollabNet. Subversion is open source software, see http://subversion.apache.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). The following repository back-end (FS) modules are available: * fs_base : Module for working with a Berkeley DB repository. * fs_fs : Module for working with a plain file (FSFS) repository. Cyrus SASL authentication is available.
It was quite a long time in the making and then a bunch of other stuff came in between, but I finally managed to release v0.4.4 of ProbABEL!
ProbABEL is a toolset for doing fast, memory (RAM) efficient genome-wide regression tests.
This is a bugfix release, but a major one for those who use the Cox proportional hazards regression module. Thanks to some of our users on the GenABEL forum, a serious bug leading to way to many NaN’s in the output was discovered, fixed and tested. This is one of the best examples of community collaboration I have seen in the GenABEL project.
Another bug fixed in this release is one that caused a failed install on MacOS X and FreeBSD. Again a bug reported on the forum by one of our users. Great work!
Uploads to Debian and the Ubuntu PPA are coming ASAP.
Now, let’s get ready for a new feature release, which will include p-value calculation (a long-standing feature request) and major speed-ups (implemented by former colleague Maarten Kooyman). Time to get to work ;-)!
After starting Emacs you end up in the *scratch* buffer (assuming you’ve disabled the startup message in your .emacs file). The *scratch* can be used for writing down notes and some Lisp experiments (since it uses the Emacs Lisp major mode by default).
Now, I’m not very much of a Lisp programmer, but I do use Org-mode a lot. Consequently, I found myself changing the buffer’s major mode to org-mode regularly. And Emacs wouldn’t be Emacs if you couldn’t change this to a default. So, thanks to Bozhidar Batsov over at Emacs Redux, I’ve added the following lines to my Emacs configuration file:
;; Set the default mode of the scratch buffer to Org (setq initial-major-mode 'org-mode) ;; and change the message accordingly (setq initial-scratch-message "\ # This buffer is for notes you don't want to save. You can use # org-mode markup (and all Org's goodness) to organise the notes. # If you want to create a file, visit that file with C-x C-f, # then enter the text in that file's own buffer. ") |
Note to self: If relying on implicit make rules, then the libraries you want to link to need to go into the LDLIBS variable, not in the LDFLAGS variable.
The case at hand: I wanted to do a quick test on how to write gzipped files using the Boost libraries. Because this was a simple example, I also wanted a simple Makefile to accompany it, meaning I wanted to use implicit rules.
Here’s the example C++ code I used, slightly modified from the Boost example:
#include <fstream> #include <iostream> #include <boost/iostreams/filtering_streambuf.hpp> #include <boost/iostreams/copy.hpp> #include <boost/iostreams/filter/gzip.hpp> namespace io = boost::iostreams; int main() { using namespace std; ifstream infile("hello.txt", ios_base::in | ios_base::binary); ofstream outfile("hello.txt.gz", ios_base::out | ios_base::binary); io::filtering_streambuf<io::output> out; out.push(io::gzip_compressor()); out.push(outfile); io::copy(infile, out); return 0; } |
The accompanying Makefile looks like this:
CXXFLAGS=-I/usr/include/boost LDLIBS=-lboost_iostreams -lboost_system -lstdc++ # Needed because otherwise cc is used, in which case -lstdc++ # must be added to -LDLIBS #CC=g++ PROGRAM=boost_write_gzip $(PROGRAM): $(PROGRAM).o clean: $(RM) $(PROGRAM).o $(PROGRAM) |
Notes
- Note the addition of
-lstdc++to theLDLIBS, this is because the implicit rule usesccto do the linking. This is no problem for C++ code, as longs as you add the C++ standard library. Alternatively, you can setCC=g++as shown in the comment, instead of adding-lstdc++. - Note that somewhere since Boost v1.50 the addition of
-lboost_systemis required. - This was done on a machine with Ubuntu Linux 13.10 installed, Boost version 1.53 (the
libboost-all-devpackage).
Links:
- StackOverflow answer pointing out my mistake
- StackOverflow answer mentioning the C++ standard library and implicit rules
- StackOverflow question on which Boost libraries need to be linked against (most don’t require anyhing beyond mentioning the include path
I took some time today to configure my R experience. I’m mostly using R from Emacs using ESS (Emacs Speaks Statistics), which means I had to configure some settings there as well.
Previously, my settings only consisted of setting a customised directory in which to install my packages and an alias to start R without asking for saving the histroy when quitting. This I did by setting the following environment variable in my .bashrc and/or .zshrc, as well as an alias:
# Set the library path for R export R_LIBS_USER=${R_LIBS_USER}:~/Programmeren/R/lib if [ -n "$(/usr/bin/which R 2>/dev/null)" ]; then alias R="$(/usr/bin/which R) --no-save" fi |
However, Emacs didn’t pick up either of these variables, so high time to fix that. This meant creating two files with the following content:
~/.Rprofile:
# Set the default CRAN repository used by install.packages() options("repos" = c(CRAN = "http://cran-mirror.cs.uu.nl/")) |
~/.Renviron:
R_LIBS="~/Programmeren/R/lib" |
I added the following to my .emacs file to start R with the --no-save option:
(setq inferior-R-args "--no-save ") |
Additionally I have the following in there to turn on a spelling checker and have line-wraps enabled:
(add-hook 'ess-mode-hook (lambda () ;; Set pdflatex as the default command for Sweave (default: texi2pdf) (setq ess-swv-pdflatex-commands (quote ("pdflatex" "texi2pdf" "make"))) (auto-fill-mode t) (flyspell-prog-mode) )) |
During the Christmas holidays I released a new version of ProbABEL (v0.4.2). The official release announcement can be found here. ProbABEL is a toolset that allows running GWAS (Genome-Wide Association Studies) in a fast and efficient manner. It implements regression using the linear, logistic or Cox proportional hazards models.
This version is mostly a bug fix release. The most important user-visible change is the fact that the ‘official’ name for the wrapper script that runs a GWAS over a range of chromosomes is now called probabel instead of probabel.pl. This change was induced by my attempts to get ProbABEL packaged in the Debian Linux repositories. One of the warnings that occurred during the package creation process was a Lintian warning that said that scripts with ‘language extensions’ are not allowed. There are several reasons for that, but the one I found most compelling was the fact that the user shouldn’t be concerned with the programming/scripting language we used to write it in. Moreover, being ‘agnostic’ in this matter also allows us to write such a script in a different language.
Of course, we have left the original name in place (via a symlink) in order not to disrupt any current pipelines. If the user runs the script with the old name a warning appears, urging him/her to start using the new name and that the old name will be deprecated in the future.
In the mean time, ProbABEL v0.4.1 has been accepted in Debian (unstable) and as of today it is also available in Debian ‘testing’. Lots of thanks to the Debian Med team that helped me a lot in preparing the .deb package. Note that the package has been split up in probabel (architecture-dependent files) and probabel-examples (with architecture independent files: the examples). See the Debian Package Tracking System page for ProbABEL for more details of the package.
From Debian the package has trickled down to Ubuntu as well (Launchpad page here), so it will be available by default in the next Ubuntu release (14.04, a.k.a. Trusty Tahr).
This is a quick example of how to do a fixed meta-analysis using the R package Rmeta, just so I dont have to look it up again next time:
## Create data frame containing betas and standard errors df <- data.frame() df <- rbind(df, c(2., 0.2)) df <- rbind(df, c(2.5, 0.4)) df <- rbind(df, c(2.2, 0.2)) ## Add study names df <- cbind(df, c("study 1", "study 2", "study 3")) colnames(df) <- c("beta", "se_beta", "name") ## Do the meta-analysis ms <- meta.summaries(df$beta, df$se_beta, names=df$name) ## Add some colors mc <- meta.colors(summary="darkgreen", zero="red") ## Make a forest plot plot(ms, xlab=expression(beta ~ " (mmol/l)"), ylab="Study", colors=mc, zero=2.6) |
The resulting plot looks like this:
Blog under the
Creative Commons Attribution-ShareAlike 3.0 License
© 2018 Lennart's weblog
Theme by Anders Noren — Up ↑