← Back to branch summary

~ubuntu-branches/ubuntu/utopic/r-cran-genabel/utopic

« back to all changes in this revision

Viewing changes to src/AbstractMatrix_R.cpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille, Charles Plessy, Andreas Tille
  • Date: 2014-08-07 17:30:04 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20140807173004-24c20tmrw61yl5dz
Tags: 1.8-0-1
[ Charles Plessy ]
* debian/control: removed myself from Uploaders.

[ Andreas Tille ]
* New upstream version
* Moved debian/upstream to debian/upstream/metadata
* cme fix dpkg-control
* More detailed copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/AbstractMatrix_R.cpp
1
 
#include "Rstaff.h"
 
1
#include "Rstuff.h"
2
2
 
3
3
#include "FilteredMatrix.h"
4
4
#include "Logger.h"
286
286
                unsigned long cachesizeMb = (unsigned long) INTEGER(cacheMb)[0];
287
287
                bool readonly = LOGICAL(ReadOnly)[0];
288
288
                string filename = CHAR(STRING_ELT(fname,0));
289
 
                if (cachesizeMb<0) {
290
 
                        error_R("negative cache size\n");
291
 
                        return R_NilValue;
292
 
                }
 
289
//              if (cachesizeMb<0) {
 
290
//                      error_R("negative cache size\n");
 
291
//                      return R_NilValue;
 
292
//              }
293
293
 
294
294
                AbstractMatrix* p = NULL;
295
295
 
362
362
                        return R_NilValue;
363
363
                }
364
364
 
365
 
                if (nvariable <0 || nvariable >= nvars) {
 
365
                if (nvariable >= nvars) {
 
366
//              if (nvariable <0 || nvariable >= nvars) {
366
367
                        error_R("nvar (%lu) out of range!\n",nvariable);
367
368
                        return R_NilValue;
368
369
                }