← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/merge.snp.data.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/merge.snp.data.cpp
188
188
        *found_error_amount_snp = *snp_error_counter;
189
189
        }
190
190
 
191
 
if(*snp_error_counter >= *error_amount_)
 
191
if(int(*snp_error_counter) >= *error_amount_)
192
192
        {       
193
193
        Rprintf("ID:Error: Too many errors while merging sets (see error table). Change error_amount value to increase error-table size.\n");
194
194
        *error_amount_=-1;
555
555
unsigned snp_error_counter=0; //this is counter for function recoding_snp_data_under_coding_and_strand 
556
556
 
557
557
 
558
 
for(int i=0 ; i<alleleID_amount_ ; i++)
 
558
for(unsigned i=0 ; i<alleleID_amount_ ; i++)
559
559
        {
560
560
        coding_polymorphism_map[alleleID[i]] = alleleID_names[i];
561
561
        }
566
566
 
567
567
//---------------------------------
568
568
std::map<char, char> alleleID_reverse;
569
 
for(int i=0 ; i<*alleleID_amount ; i++)
 
569
for(unsigned i=0 ; i<*alleleID_amount ; i++)
570
570
        {
571
571
        alleleID_reverse[alleleID[i]] = alleleID_reverse_array[i];
572
572
        }