Commit 84de90d7 authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'develop' into topic/actor-system

parents f7427b67 13285435
......@@ -235,17 +235,20 @@ if(CAF_IOS_DEPLOYMENT_TARGET)
endif()
endif()
# check if the user provided CXXFLAGS, set defaults otherwise
if(CMAKE_CXX_FLAGS)
set(CMAKE_CXX_FLAGS_DEBUG "")
set(CMAKE_CXX_FLAGS_MINSIZEREL "")
set(CMAKE_CXX_FLAGS_RELEASE "")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "")
else()
set(CMAKE_CXX_FLAGS "-std=c++11 -Wextra -Wall -pedantic ${EXTRA_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
if(NOT CMAKE_CXX_FLAGS)
set(CMAKE_CXX_FLAGS "-std=c++11 -Wextra -Wall -pedantic ${EXTRA_FLAGS}")
endif()
if(NOT CMAKE_CXX_FLAGS_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
endif()
if(NOT CMAKE_CXX_FLAGS_MINSIZEREL)
set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os")
endif()
if(NOT CMAKE_CXX_FLAGS_RELEASE)
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
endif()
if(NOT CMAKE_CXX_FLAGS_RELWITHDEBINFO)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
endif()
# set build default build type to RelWithDebInfo if not set
if(NOT CMAKE_BUILD_TYPE)
......
#!/usr/bin/env python
from __future__ import print_function
import sys
# decodes 6bit characters to ASCII
DECODING_TABLE = ' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz'
def atom_read(x):
result = ''
read_chars = ((x & 0xF000000000000000) >> 60) == 0xF
mask = 0x0FC0000000000000
bitshift = 54
while bitshift >= 0:
if read_chars:
result += DECODING_TABLE[(x & mask) >> bitshift]
elif ((x & mask) >> bitshift) == 0xF:
read_chars = True
bitshift -= 6
mask = mask >> 6
return result
if __name__ == '__main__':
if len(sys.argv) != 2:
print('*** Usage: atom.py <atom_val>')
sys.exit(-1)
try:
s = sys.argv[1]
if s.startswith('0x'):
val = int(s, 16)
else:
val = int(s)
print(atom_read(val))
except ValueError:
print('Not a number:', sys.argv[1])
print('*** Usage: atom.py <atom_val>')
sys.exit(-2)
......@@ -41,7 +41,7 @@ iwanthue <- function(n, hmin=0, hmax=360, cmin=0, cmax=180, lmin=0, lmax=100) {
lab <- as(hcl, 'LAB')
}
lab <- lab[which(!is.na(hex(lab))), ]
clus <- kmeans(coords(lab), n, iter.max=50)
clus <- kmeans(coords(lab), n, iter.max=100, algorithm="MacQueen")
hex(LAB(clus$centers))
}
......@@ -127,8 +127,8 @@ add_points <- function(p, .data) {
# hiding smaller point groups behind big point clouds.
f <- table(.data$label)
o <- names(rev(sort(f))) # order of layers
pts <- lapply(o, function(x) { force(x); geom_point(subset=.(label == x)) })
r <- Reduce("+", pts, r)
gp <- function(x) { force(x); geom_point(data=subset(.data, label == x)) }
r <- Reduce("+", lapply(o, gp), r)
# Give each layer its own color and assign it it custom alpha value
# inversely proportional to the point frequency.
n <- length(f)
......@@ -211,7 +211,7 @@ plot_time_boxplot <- function(.data) {
aes(x=label, y=cpu, fill=util) +
# TODO: re-enable when fixing the magic transformation.
# annotation_logticks(sides="lr", color="grey") +
geom_boxplot(outlier.color="grey") +
geom_boxplot(outlier.colour="grey") +
labs(x="ID", y="CPU time") +
scale_y_time(xs$cpu) +
scale_fill_gradient(name="Utilization", low="red", high="green",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment