[Rcpp-commits] r3240 - in pkg/int64: inst/include inst/include/int64 inst/unitTests src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Oct 29 16:06:42 CEST 2011
Author: edd
Date: 2011-10-29 16:06:42 +0200 (Sat, 29 Oct 2011)
New Revision: 3240
Modified:
pkg/int64/inst/include/int64.h
pkg/int64/inst/include/int64/LongVector.h
pkg/int64/inst/include/int64/arith.h
pkg/int64/inst/include/int64/as_character.h
pkg/int64/inst/include/int64/as_long.h
pkg/int64/inst/include/int64/format_binary.h
pkg/int64/inst/include/int64/get_class.h
pkg/int64/inst/include/int64/get_long.h
pkg/int64/inst/include/int64/int64.h
pkg/int64/inst/include/int64/routines.h
pkg/int64/inst/include/int64/summary.h
pkg/int64/inst/unitTests/runTests.R
pkg/int64/inst/unitTests/runit.int64.R
pkg/int64/src/int64.cpp
pkg/int64/src/int64_init.c
Log:
normalising the copyright statement to what Google seems to use in other projects
Modified: pkg/int64/inst/include/int64/LongVector.h
===================================================================
--- pkg/int64/inst/include/int64/LongVector.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/LongVector.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// routines.h: int64 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/arith.h
===================================================================
--- pkg/int64/inst/include/int64/arith.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/arith.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// arith.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/as_character.h
===================================================================
--- pkg/int64/inst/include/int64/as_character.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/as_character.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// as_character.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/as_long.h
===================================================================
--- pkg/int64/inst/include/int64/as_long.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/as_long.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// as_long.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/format_binary.h
===================================================================
--- pkg/int64/inst/include/int64/format_binary.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/format_binary.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// format_binary.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/get_class.h
===================================================================
--- pkg/int64/inst/include/int64/get_class.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/get_class.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// get_class.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/get_long.h
===================================================================
--- pkg/int64/inst/include/int64/get_long.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/get_long.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// get_long.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/int64.h
===================================================================
--- pkg/int64/inst/include/int64/int64.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/int64.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// int64.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/routines.h
===================================================================
--- pkg/int64/inst/include/int64/routines.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/routines.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// routines.h: int64 64 bit integers - .Call exports
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64/summary.h
===================================================================
--- pkg/int64/inst/include/int64/summary.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64/summary.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// summary.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/include/int64.h
===================================================================
--- pkg/int64/inst/include/int64.h 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/include/int64.h 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// int64.h : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/inst/unitTests/runTests.R
===================================================================
--- pkg/int64/inst/unitTests/runTests.R 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/unitTests/runTests.R 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,5 +1,5 @@
## Copyright (C) 2011 Romain Francois
-## Copyright (C) 2011 Google
+## Copyright (C) 2011 Google Inc. All rights reserved.
##
## This file is part of int64.
##
@@ -121,13 +121,13 @@
## This will cause R CMD check to return error and stop
err <- getErrors(tests)
if( (err$nFail + err$nErr) > 0) {
- data <- Filter(
- function(x) any( sapply(x, function(.) .[["kind"]] ) %in% c("error","failure") ) ,
+ data <- Filter(
+ function(x) any( sapply(x, function(.) .[["kind"]] ) %in% c("error","failure") ) ,
tests[[1]]$sourceFileResults )
- err_msg <- sapply( data,
+ err_msg <- sapply( data,
function(x) {
- raw.msg <- paste(
- sapply( Filter( function(.) .[["kind"]] %in% c("error","failure"), x ), "[[", "msg" ),
+ raw.msg <- paste(
+ sapply( Filter( function(.) .[["kind"]] %in% c("error","failure"), x ), "[[", "msg" ),
collapse = " // "
)
raw.msg <- gsub( "Error in compileCode(f, code, language = language, verbose = verbose) : \n", "", raw.msg, fixed = TRUE )
@@ -136,7 +136,7 @@
}
)
msg <- sprintf( "unit test problems: %d failures, %d errors\n%s",
- err$nFail, err$nErr,
+ err$nFail, err$nErr,
paste( err_msg, collapse = "\n" )
)
stop( msg )
Modified: pkg/int64/inst/unitTests/runit.int64.R
===================================================================
--- pkg/int64/inst/unitTests/runit.int64.R 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/inst/unitTests/runit.int64.R 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,5 +1,5 @@
# Copyright (C) 2011 Romain Francois
-# Copyright (C) 2011 Google
+# Copyright (C) 2011 Google Inc. All rights reserved.
#
# This file is part of int64.
#
@@ -19,49 +19,49 @@
test.int64 <- function(){
ints <- c(-122L, 0L, 1L, 122L)
x <- as.int64(ints)
-
+
checkEquals(
- as.integer(as.character(x)),
+ as.integer(as.character(x)),
ints
)
checkEquals( as.character(x+1L), as.character(ints+1L) )
checkEquals( as.character(x-1L), as.character(ints-1L) )
checkEquals( as.character(x*x), as.character(ints*ints) )
checkEquals( as.character(x/2L), as.character(as.integer(ints/2L)) )
-
+
checkEquals( x > 0L, ints > 0L )
checkEquals( x < 0L, ints < 0L )
checkEquals( x == 0L, ints == 0L )
checkEquals( x != 0L, ints != 0L )
checkEquals( x <= 0L, ints <= 0L )
checkEquals( x >= 0L, ints >= 0L )
-
- checkEquals( range(x), as.int64(c(-122L, 122L)) )
+
+ checkEquals( range(x), as.int64(c(-122L, 122L)) )
checkEquals( min(x), as.int64(-122L) )
checkEquals( max(x), as.int64(122L) )
checkEquals( prod(x), as.int64(as.integer(prod(ints))) )
checkEquals( sum(x), as.int64(as.integer(sum(ints))) )
checkEquals( any(x), any(ints) )
checkEquals( all(x), all(ints) )
-
+
chars <- c( "-9223372036854775808", "9223372036854775807" )
x <- as.int64( chars )
checkEquals( as.character(x), chars )
-
+
}
test.uint64 <- function(){
ints <- c(0L, 1L, 123L)
x <- as.uint64(ints)
-
+
checkEquals(
- as.integer(as.character(x)),
+ as.integer(as.character(x)),
ints
)
-
+
chars <- c( "123456789123456789", "18446744073709551615" )
x <- as.uint64( chars )
checkEquals( as.character(x), chars )
-
+
}
Modified: pkg/int64/src/int64.cpp
===================================================================
--- pkg/int64/src/int64.cpp 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/src/int64.cpp 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// routines.h: int64 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
Modified: pkg/int64/src/int64_init.c
===================================================================
--- pkg/int64/src/int64_init.c 2011-10-29 09:00:37 UTC (rev 3239)
+++ pkg/int64/src/int64_init.c 2011-10-29 14:06:42 UTC (rev 3240)
@@ -1,7 +1,7 @@
// int64_init.c : 64 bit integers
//
// Copyright (C) 2011 Romain Francois
-// Copyright (C) 2011 Google
+// Copyright (C) 2011 Google Inc. All rights reserved.
//
// This file is part of int64.
//
More information about the Rcpp-commits
mailing list