Debug
BIN
results/180sec.png
Normal file
After Width: | Height: | Size: 431 KiB |
BIN
results/60sec.png
Normal file
After Width: | Height: | Size: 416 KiB |
115
results/analysis2.R
Normal file
|
@ -0,0 +1,115 @@
|
|||
library("tidyverse")
|
||||
library("gridExtra")
|
||||
|
||||
data=read_csv("results.csv")
|
||||
r_=function(x){round(x,digits=1)}
|
||||
color=function(){scale_fill_manual(values = c("#00AFBB", "#E7B800", "#FC4E07"))}
|
||||
|
||||
energy60=data%>%filter(wakeupfor==60)
|
||||
energy60Snd=energy60%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),energy=mean(energy),type="Sender")
|
||||
energy60Rcv=energy60%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),energy=mean(energy),type="Receiver")
|
||||
energy60=energy60Snd%>%ungroup()%>%rbind(energy60Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver")))
|
||||
energy60=energy60%>%mutate(sd_min=energy-sd,sd_max=energy+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
energy60P=ggplot(energy60,aes(x=simkey,y=energy,fill=type))+
|
||||
geom_bar(stat="identity",position=position_dodge())+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=energy-sd, ymax=energy+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(energy), y= energy/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Energy Consumption (J)")+
|
||||
labs(fill="Node type")+theme(legend.position="top")+color()
|
||||
#ggsave("energy-60sec.png",width = 12,height=4.8)
|
||||
|
||||
energy180=data%>%filter(wakeupfor==180)
|
||||
energy180Snd=energy180%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),energy=mean(energy),type="Sender")
|
||||
energy180Rcv=energy180%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(energy),energy=mean(energy),type="Receiver")
|
||||
energy180=energy180Snd%>%ungroup()%>%rbind(energy180Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver")))
|
||||
energy180=energy180%>%mutate(sd_min=energy-sd,sd_max=energy+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
energy180P=ggplot(energy180,aes(x=simkey,y=energy,fill=type))+
|
||||
geom_bar(stat="identity",position=position_dodge())+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=energy-sd, ymax=energy+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(energy), y= energy/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Energy Consumption (J)")+
|
||||
labs(fill="Node type")+theme(legend.position="top")+color()
|
||||
#ggsave("energy-180sec.png",width = 12,height=4.8)
|
||||
|
||||
|
||||
success60=data%>%filter(wakeupfor==60)
|
||||
success60=success60%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(nSend),success=mean(nSend))
|
||||
success60=success60%>%mutate(sd_min=success-sd,sd_max=success+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
|
||||
|
||||
totalUptime60=data%>%filter(wakeupfor==60)
|
||||
totalUptime60Snd=totalUptime60%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Sender")
|
||||
totalUptime60Rcv=totalUptime60%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Receiver")
|
||||
totalUptime60=totalUptime60Snd%>%ungroup()%>%rbind(totalUptime60Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver")))
|
||||
totalUptime60=totalUptime60%>%mutate(sd_min=totalUptime-sd,sd_max=totalUptime+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
totalUptime60P=ggplot(totalUptime60,aes(x=simkey,y=totalUptime,fill=type))+
|
||||
geom_bar(stat="identity",position=position_dodge())+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=totalUptime-sd, ymax=totalUptime+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(totalUptime), y= totalUptime/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Accumulated Uptime Consumption (s)")+
|
||||
labs(fill="Node type")+theme(legend.position="none")+color()
|
||||
|
||||
totalUptime180=data%>%filter(wakeupfor==180)
|
||||
totalUptime180Snd=totalUptime180%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Sender")
|
||||
totalUptime180Rcv=totalUptime180%>%filter(isSender==0)%>%group_by(simkey,wireless)%>%summarise(sd=sd(totalUptime),totalUptime=mean(totalUptime),type="Receiver")
|
||||
totalUptime180=totalUptime180Snd%>%ungroup()%>%rbind(totalUptime180Rcv)%>%mutate(type=factor(type,levels = c("Sender","Receiver")))
|
||||
totalUptime180=totalUptime180%>%mutate(sd_min=totalUptime-sd,sd_max=totalUptime+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
totalUptime180P=ggplot(totalUptime180,aes(x=simkey,y=totalUptime,fill=type))+
|
||||
geom_bar(stat="identity",position=position_dodge())+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=totalUptime-sd, ymax=totalUptime+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(totalUptime), y= totalUptime/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Accumulated Uptime Consumption (s)")+
|
||||
labs(fill="Node type")+theme(legend.position="none")+color()
|
||||
|
||||
|
||||
|
||||
|
||||
success60P=ggplot(success60,aes(x=simkey,y=success))+
|
||||
geom_bar(stat="identity",position=position_dodge(),fill="gray50")+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=success-sd, ymax=success+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(success), y= success/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Number of success")+
|
||||
labs(fill="Node type")+theme(legend.position="none")+color()
|
||||
#ggsave("success-60sec.png",width = 5.8,height=4.2)
|
||||
|
||||
success180=data%>%filter(wakeupfor==180)
|
||||
success180=success180%>%filter(isSender==1)%>%group_by(simkey,wireless)%>%summarise(sd=sd(nSend),success=mean(nSend))
|
||||
success180=success180%>%mutate(sd_min=success-sd,sd_max=success+sd)%>%mutate(sd_min_txt=paste0("-",r_(sd)))%>%mutate(sd_max_txt=paste0("+",r_(sd)))
|
||||
|
||||
success180P=ggplot(success180,aes(x=simkey,y=success))+
|
||||
geom_bar(stat="identity",position=position_dodge(),fill="gray50")+
|
||||
geom_errorbar(position=position_dodge(0.9),aes(ymin=success-sd, ymax=success+sd),width=0.5,size=1.5)+
|
||||
geom_text(aes(label = sd_max_txt, y= sd_max),vjust=-0.4,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = sd_min_txt, y= sd_min),vjust=+1.5,position=position_dodge(0.9))+
|
||||
geom_text(aes(label = r_(success), y= success/2),fontface="bold",colour="white",position=position_dodge(0.9))+
|
||||
facet_wrap(~wireless)+
|
||||
xlab("Policy")+ylab("Number of success")+
|
||||
labs(fill="Node type")+theme(legend.position="none")+color()
|
||||
#ggsave("success-180sec.png",width = 5.8,height=4.2)
|
||||
|
||||
sec60P=grid.arrange(energy60P,totalUptime60P,success60P,heights=c(2,2,2),widths=1,ncol=1)
|
||||
ggsave("60sec.png",plot=sec60P,width=11,height=15)
|
||||
|
||||
sec180P=grid.arrange(energy180P,totalUptime180P,success180P,heights=c(2,2,2),widths=1,ncol=1)
|
||||
ggsave("180sec.png",plot=sec180P,width=11,height=15)
|
||||
|
Before Width: | Height: | Size: 122 KiB After Width: | Height: | Size: 82 KiB |
BIN
results/energy-180sec.png
Normal file
After Width: | Height: | Size: 194 KiB |
BIN
results/energy-60sec.png
Normal file
After Width: | Height: | Size: 188 KiB |
Before Width: | Height: | Size: 250 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 101 KiB |
Before Width: | Height: | Size: 113 KiB After Width: | Height: | Size: 94 KiB |
Before Width: | Height: | Size: 160 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 136 KiB After Width: | Height: | Size: 83 KiB |
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 85 KiB |
Before Width: | Height: | Size: 124 KiB After Width: | Height: | Size: 84 KiB |
|
@ -31,7 +31,7 @@ run-simulation () {
|
|||
[ -e "$results" ] && { cat $tmp | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results"; }
|
||||
|
||||
# Gen scheduler analysis
|
||||
[ $seed -eq 1 ] && $sched $tmp "logs/simkey${simkey}_uptime${wakeupfor}_hint${hint}_extended${extended}_wireless${wireless}.png"
|
||||
[ $seed -eq 1 ] && $sched $tmp "logs/$(echo ${avalues}|tr ',' '_')_hint${hint}_extended${extended}.png"
|
||||
|
||||
# Clear tmp
|
||||
rm $tmp
|
||||
|
|
|
@ -6,12 +6,13 @@ wai=$(dirname $(readlink -f "$0"))
|
|||
scenarios="${wai}/../scenarios"
|
||||
inputs="${wai}/../inputs.json"
|
||||
simulator="make -C ${wai}/../ run"
|
||||
sched="${wai}/scheduler/analysis.sh"
|
||||
parser="${wai}/../parser.awk"
|
||||
results="${wai}/results_.csv"
|
||||
results="${wai}/results.csv"
|
||||
aheaders="simkey,wireless,wakeupfor"
|
||||
avalues="none,none,none"
|
||||
log_file="${wai}/logs/$(date +%s)_.org" && mkdir -p "${wai}/logs/"
|
||||
gen_log=1 # Should we generate logs ?
|
||||
log_file="${wai}/logs/$(date +%s).org" && mkdir -p "${wai}/logs/"
|
||||
gen_log=0 # Should we generate logs ?
|
||||
|
||||
run-simulation () {
|
||||
# Generate inputs
|
||||
|
@ -20,15 +21,29 @@ run-simulation () {
|
|||
# Init logs
|
||||
[ $gen_log -eq 1 ] && echo -e "* seed=$seed simtime=$simtime wakeupevery=$wakeupevery wakeupfor=$wakeupfor n_nodes=$n_nodes extended=$extended hint=$hint poff=$poff pon=$pon prx=$prx ptx=$ptx datasize=$datasize bitrate=$bitrate \n" >> "${log_file}"
|
||||
|
||||
$simulator 2>&1
|
||||
# Run simulations
|
||||
tmp=$(mktemp)
|
||||
$simulator &> $tmp
|
||||
[ $gen_log -eq 1 ] && cp $tmp "${log_file}"
|
||||
|
||||
# Gen csv
|
||||
[ ! -e "$results" ] && { cat $tmp | $parser | sed "1 s/$/,${aheaders}/g" | sed "2,\$s/$/,${avalues}/" > "$results"; }
|
||||
[ -e "$results" ] && { cat $tmp | $parser | sed 1d | sed "s/$/,${avalues}/" >> "$results"; }
|
||||
|
||||
# Gen scheduler analysis
|
||||
#[ $seed -eq 1 ] && $sched $tmp "logs/$(echo ${avalues}|tr ',' '_')_hint${hint}_extended${extended}.png"
|
||||
|
||||
# Clear tmp
|
||||
cat $tmp
|
||||
rm $tmp
|
||||
}
|
||||
|
||||
# Default Parameters
|
||||
seed=1
|
||||
seed=0
|
||||
simtime=86400 # One day
|
||||
wakeupevery=3600
|
||||
wakeupfor=60
|
||||
n_nodes=12
|
||||
n_nodes=13
|
||||
extended="false"
|
||||
hint="false"
|
||||
poff=0
|
||||
|
@ -44,21 +59,16 @@ bitrate="100kbps"
|
|||
|
||||
run-scenarios() {
|
||||
# Configure number of seed per scenarios
|
||||
nseed=1
|
||||
nseed=200
|
||||
|
||||
|
||||
# Hint
|
||||
hint="true"
|
||||
avalues="hint,$wireless,$wakeupfor"
|
||||
for seed in $(seq 1 $nseed)
|
||||
# Baseline
|
||||
avalues="baseline,$wireless,$wakeupfor"
|
||||
for seed in 17
|
||||
do
|
||||
printf "\rHint...${seed}"
|
||||
printf "\rBaseline...${seed}"
|
||||
run-simulation
|
||||
done
|
||||
hint="false"
|
||||
echo
|
||||
|
||||
|
||||
}
|
||||
|
||||
# Clean previous runs
|
||||
|
@ -76,16 +86,4 @@ do
|
|||
ptx=0.16
|
||||
latency=0
|
||||
run-scenarios
|
||||
|
||||
# NbIot
|
||||
echo "----- Run NbIoT (wakeupfor=$wakeupfor) -----"
|
||||
wireless="nbiot"
|
||||
bitrate="200kbps"
|
||||
pon=0.4
|
||||
prx=0.65
|
||||
ptx=0.65
|
||||
latency=0.01
|
||||
#run-scenarios
|
||||
done
|
||||
|
||||
echo "Logs: $log_file"
|
||||
done
|
41758
results/results.csv
|
@ -1 +1,13 @@
|
|||
node,ts
|
||||
on8,4398.010320
|
||||
on10,8258.010320
|
||||
on6,8299.630960
|
||||
on4,11766.010320
|
||||
on5,16301.020640
|
||||
on1,18165.010320
|
||||
on7,18205.030960
|
||||
on12,18289.620640
|
||||
on11,18340.620640
|
||||
on2,22575.010320
|
||||
on9,25587.010320
|
||||
on3,29232.020320
|
||||
|
|
|
|
@ -1 +1,18 @@
|
|||
node,wakets,duration,rcvat
|
||||
on4,8218.000000,180.000000,4398.020320
|
||||
on4,8218.000000,180.000000,4398.030640
|
||||
on6,11726.000000,180.000000,8258.020320
|
||||
on4,11726.000000,180.000000,8258.020640
|
||||
on2,16260.000000,180.000000,11906.030640
|
||||
on7,16260.000000,180.000000,12051.040640
|
||||
on5,16260.000000,180.000000,12200.850640
|
||||
on1,16260.000000,180.000000,16208.210000
|
||||
on2,18125.000000,180.000000,16261.010320
|
||||
on1,18125.000000,180.000000,16301.030960
|
||||
on7,18125.000000,180.000000,16301.030960
|
||||
on7,22535.000000,180.000000,18165.020320
|
||||
on2,22535.000000,180.000000,18165.020640
|
||||
on12,22535.000000,180.000000,18249.010320
|
||||
on11,22535.000000,180.000000,18300.010320
|
||||
on9,25547.000000,180.000000,24298.010000
|
||||
on3,34755.000000,180.000000,29192.010000
|
||||
|
|
|
|
@ -1 +1,12 @@
|
|||
node,ts
|
||||
on8,4398.020320
|
||||
on10,8258.020320
|
||||
on6,11906.030640
|
||||
on2,12051.040640
|
||||
on7,12200.850640
|
||||
on2,16208.210000
|
||||
on1,16261.010320
|
||||
on2,16301.030960
|
||||
on1,18165.020320
|
||||
on2,24298.010000
|
||||
on12,29192.010000
|
||||
|
|
|
|
@ -42,14 +42,24 @@ if(NROW(hint_fw)!=0){
|
|||
}
|
||||
p1=p1+
|
||||
xlab("Time (hours)")+ylab("Node")+
|
||||
scale_x_continuous(breaks = ts_range, labels=ts_labels)+
|
||||
scale_x_continuous(breaks = ts_range, labels=ts_labels,expand = c(0, 0))+
|
||||
scale_colour_manual(name="Legend",values=c("Hint slots"="blue","Data received"="red","Hint received"="green","Hint Forwarded"="purple"))+
|
||||
theme(panel.grid.major.x = element_line(size = 1.2),panel.grid.major.y = element_blank(),panel.grid.minor = element_blank())
|
||||
|
||||
stats=data%>%group_by(node)%>%summarise(n=n())%>%mutate(n=n-24)
|
||||
stats=data%>%group_by(node)%>%summarise(n=n())%>%mutate(nwakeup=n-24)
|
||||
|
||||
p2=ggplot(stats,aes(x=node,y=n))+
|
||||
geom_bar(stat="identity")+xlab("Node")+ylab("Extra wake up count")
|
||||
p2=ggplot(stats,aes(x=node,y=nwakeup))+
|
||||
geom_bar(stat="identity")+xlab("Node")+ylab("Extra wake up count")+ylim(0,10)+
|
||||
scale_y_continuous(breaks = seq(0,10))
|
||||
|
||||
p=grid.arrange(p1,p2,heights=c(10,5))
|
||||
stats2=tibble(
|
||||
metric=c("Hint Received","Hint Forwarded","Data Received"),
|
||||
count=c(NROW(hint),NROW(hint_fw),NROW(data_rcv))
|
||||
)
|
||||
|
||||
p3=ggplot(stats2,aes(x=metric,y=count))+
|
||||
geom_bar(stat="identity")+xlab("Metric")+ylab("Count")+ylim(0,20)
|
||||
|
||||
|
||||
p=grid.arrange(p1,p2,p3,heights=c(10,5,5))
|
||||
ggsave(plot=p,"schedule.png",dpi=300,width = 10,height=10)
|
||||
|
|
|
@ -1,313 +1,326 @@
|
|||
node,wakets,sleepts,duration
|
||||
on10,797.000000,857.000000,60
|
||||
on10,3817.000000,3877.000000,60
|
||||
on10,7493.000000,7553.000000,60
|
||||
on10,13081.000000,13141.000000,60
|
||||
on10,16688.000000,16748.000000,60
|
||||
on10,19900.000000,19960.000000,60
|
||||
on10,24312.000000,24372.000000,60
|
||||
on10,27853.000000,27913.000000,60
|
||||
on10,30029.000000,30089.000000,60
|
||||
on10,33155.000000,33215.000000,60
|
||||
on10,36498.000000,36558.000000,60
|
||||
on10,41540.000000,41600.000000,60
|
||||
on10,43856.000000,43916.000000,60
|
||||
on10,46829.000000,46889.000000,60
|
||||
on10,53634.000000,53694.000000,60
|
||||
on10,55295.000000,55355.000000,60
|
||||
on10,61145.000000,61205.000000,60
|
||||
on10,63308.000000,63368.000000,60
|
||||
on10,65078.000000,65138.000000,60
|
||||
on10,68835.000000,68895.000000,60
|
||||
on10,72928.000000,72988.000000,60
|
||||
on10,78306.000000,78366.000000,60
|
||||
on10,80009.000000,80069.000000,60
|
||||
on10,83594.000000,83654.000000,60
|
||||
on2,316.000000,376.000000,60
|
||||
on2,5032.000000,5092.000000,60
|
||||
on2,8332.000000,8392.000000,60
|
||||
on2,11006.000000,11066.000000,60
|
||||
on2,15063.000000,15123.000000,60
|
||||
on2,19460.000000,19520.000000,60
|
||||
on2,25060.000000,25120.000000,60
|
||||
on2,28609.000000,28669.000000,60
|
||||
on2,28993.000000,29053.000000,60
|
||||
on2,35630.000000,35690.000000,60
|
||||
on2,39243.000000,39303.000000,60
|
||||
on2,42054.000000,42114.000000,60
|
||||
on2,43405.000000,43465.000000,60
|
||||
on2,46880.000000,46940.000000,60
|
||||
on2,52646.000000,52706.000000,60
|
||||
on2,55675.000000,55735.000000,60
|
||||
on2,58108.000000,58168.000000,60
|
||||
on2,61815.000000,61875.000000,60
|
||||
on2,66689.000000,66749.000000,60
|
||||
on2,68749.000000,68809.000000,60
|
||||
on2,73259.000000,73319.000000,60
|
||||
on2,76055.000000,76115.000000,60
|
||||
on2,81097.000000,81157.000000,60
|
||||
on2,83270.000000,83330.000000,60
|
||||
on3,1794.000000,1854.000000,60
|
||||
on3,6839.000000,6899.000000,60
|
||||
on3,8919.000000,8979.000000,60
|
||||
on3,12222.000000,12282.000000,60
|
||||
on3,16294.000000,16354.000000,60
|
||||
on3,19934.000000,19994.000000,60
|
||||
on3,22387.000000,22447.000000,60
|
||||
on3,27411.000000,27471.000000,60
|
||||
on3,30076.000000,30136.000000,60
|
||||
on3,35829.000000,35889.000000,60
|
||||
on3,38417.000000,38477.000000,60
|
||||
on3,41539.000000,41599.000000,60
|
||||
on3,44488.000000,44548.000000,60
|
||||
on3,46985.000000,47045.000000,60
|
||||
on3,53657.000000,53717.000000,60
|
||||
on3,55482.000000,55542.000000,60
|
||||
on3,61015.000000,61075.000000,60
|
||||
on3,64099.000000,64159.000000,60
|
||||
on3,65135.000000,65195.000000,60
|
||||
on3,68420.000000,68480.000000,60
|
||||
on3,72888.000000,72948.000000,60
|
||||
on3,76090.000000,76150.000000,60
|
||||
on3,82405.000000,82465.000000,60
|
||||
on3,84196.000000,84256.000000,60
|
||||
on11,757.000000,817.000000,60
|
||||
on11,6992.000000,7052.000000,60
|
||||
on11,8375.000000,8435.000000,60
|
||||
on11,12803.000000,12863.000000,60
|
||||
on11,17287.000000,17347.000000,60
|
||||
on11,20522.000000,20582.000000,60
|
||||
on11,21840.000000,21900.000000,60
|
||||
on11,26793.000000,26853.000000,60
|
||||
on11,31539.000000,31599.000000,60
|
||||
on11,32933.000000,32993.000000,60
|
||||
on11,36273.000000,36333.000000,60
|
||||
on11,42536.000000,42596.000000,60
|
||||
on11,45634.000000,45694.000000,60
|
||||
on11,47694.000000,47754.000000,60
|
||||
on11,52389.000000,52449.000000,60
|
||||
on11,55572.000000,55632.000000,60
|
||||
on11,59249.000000,59309.000000,60
|
||||
on11,61596.000000,61656.000000,60
|
||||
on11,68313.000000,68373.000000,60
|
||||
on11,68614.000000,68674.000000,60
|
||||
on11,72425.000000,72485.000000,60
|
||||
on11,76655.000000,76715.000000,60
|
||||
on11,80709.000000,80769.000000,60
|
||||
on11,83170.000000,83230.000000,60
|
||||
on12,3163.000000,3223.000000,60
|
||||
on12,6898.000000,6958.000000,60
|
||||
on12,9515.000000,9575.000000,60
|
||||
on12,12800.000000,12860.000000,60
|
||||
on12,14712.000000,14772.000000,60
|
||||
on12,21125.000000,21185.000000,60
|
||||
on12,24395.000000,24455.000000,60
|
||||
on12,26269.000000,26329.000000,60
|
||||
on12,31716.000000,31776.000000,60
|
||||
on12,34279.000000,34339.000000,60
|
||||
on12,36981.000000,37041.000000,60
|
||||
on12,39711.000000,39771.000000,60
|
||||
on12,44000.000000,44060.000000,60
|
||||
on12,48021.000000,48081.000000,60
|
||||
on12,52104.000000,52164.000000,60
|
||||
on12,57539.000000,57599.000000,60
|
||||
on12,60865.000000,60925.000000,60
|
||||
on12,64687.000000,64747.000000,60
|
||||
on12,65584.000000,65644.000000,60
|
||||
on12,68407.000000,68467.000000,60
|
||||
on12,72781.000000,72841.000000,60
|
||||
on12,78373.000000,78433.000000,60
|
||||
on12,80779.000000,80839.000000,60
|
||||
on12,83139.000000,83199.000000,60
|
||||
on4,2616.000000,2676.000000,60
|
||||
on4,5094.000000,5154.000000,60
|
||||
on4,10456.000000,10516.000000,60
|
||||
on4,11074.000000,11134.000000,60
|
||||
on4,17859.000000,17919.000000,60
|
||||
on4,21062.000000,21122.000000,60
|
||||
on4,22344.000000,22404.000000,60
|
||||
on4,26853.000000,26913.000000,60
|
||||
on4,29409.000000,29469.000000,60
|
||||
on4,32773.000000,32833.000000,60
|
||||
on4,36984.000000,37044.000000,60
|
||||
on4,42104.000000,42164.000000,60
|
||||
on4,43416.000000,43476.000000,60
|
||||
on4,50081.000000,50141.000000,60
|
||||
on4,51514.000000,51574.000000,60
|
||||
on4,57002.000000,57062.000000,60
|
||||
on4,60710.000000,60770.000000,60
|
||||
on4,62640.000000,62700.000000,60
|
||||
on4,67650.000000,67710.000000,60
|
||||
on4,70707.000000,70767.000000,60
|
||||
on4,73626.000000,73686.000000,60
|
||||
on4,78106.000000,78166.000000,60
|
||||
on4,80898.000000,80958.000000,60
|
||||
on4,84240.000000,84300.000000,60
|
||||
on5,3314.000000,3374.000000,60
|
||||
on5,7144.000000,7204.000000,60
|
||||
on5,10170.000000,10230.000000,60
|
||||
on5,11402.000000,11462.000000,60
|
||||
on5,14833.000000,14893.000000,60
|
||||
on5,20575.000000,20635.000000,60
|
||||
on5,25108.000000,25168.000000,60
|
||||
on5,26158.000000,26218.000000,60
|
||||
on5,30778.000000,30838.000000,60
|
||||
on5,33472.000000,33532.000000,60
|
||||
on5,38743.000000,38803.000000,60
|
||||
on5,42946.000000,43006.000000,60
|
||||
on5,43733.000000,43793.000000,60
|
||||
on5,48196.000000,48256.000000,60
|
||||
on5,53308.000000,53368.000000,60
|
||||
on5,55143.000000,55203.000000,60
|
||||
on5,60879.000000,60939.000000,60
|
||||
on5,61491.000000,61551.000000,60
|
||||
on5,66356.000000,66416.000000,60
|
||||
on5,71896.000000,71956.000000,60
|
||||
on5,73482.000000,73542.000000,60
|
||||
on5,78270.000000,78330.000000,60
|
||||
on5,80006.000000,80066.000000,60
|
||||
on5,83791.000000,83851.000000,60
|
||||
on6,2019.000000,2079.000000,60
|
||||
on6,3656.000000,3716.000000,60
|
||||
on6,10498.000000,10558.000000,60
|
||||
on6,10844.000000,10904.000000,60
|
||||
on6,16962.000000,17022.000000,60
|
||||
on6,19396.000000,19456.000000,60
|
||||
on6,24595.000000,24655.000000,60
|
||||
on6,27476.000000,27536.000000,60
|
||||
on6,31649.000000,31709.000000,60
|
||||
on6,32673.000000,32733.000000,60
|
||||
on6,36787.000000,36847.000000,60
|
||||
on6,40791.000000,40851.000000,60
|
||||
on6,43957.000000,44017.000000,60
|
||||
on6,49004.000000,49064.000000,60
|
||||
on6,52550.000000,52610.000000,60
|
||||
on6,56735.000000,56795.000000,60
|
||||
on6,60877.000000,60937.000000,60
|
||||
on6,62492.000000,62552.000000,60
|
||||
on6,65190.000000,65250.000000,60
|
||||
on6,70119.000000,70179.000000,60
|
||||
on6,74688.000000,74748.000000,60
|
||||
on6,78898.000000,78958.000000,60
|
||||
on6,82062.000000,82122.000000,60
|
||||
on6,83076.000000,83136.000000,60
|
||||
on7,3590.000000,3650.000000,60
|
||||
on7,5927.000000,5987.000000,60
|
||||
on7,7371.000000,7431.000000,60
|
||||
on7,13781.000000,13841.000000,60
|
||||
on7,17306.000000,17366.000000,60
|
||||
on7,18977.000000,19037.000000,60
|
||||
on7,21971.000000,22031.000000,60
|
||||
on7,26525.000000,26585.000000,60
|
||||
on7,31343.000000,31403.000000,60
|
||||
on7,33978.000000,34038.000000,60
|
||||
on7,37369.000000,37429.000000,60
|
||||
on7,41105.000000,41165.000000,60
|
||||
on7,44083.000000,44143.000000,60
|
||||
on7,49073.000000,49133.000000,60
|
||||
on7,52090.000000,52150.000000,60
|
||||
on7,54131.000000,54191.000000,60
|
||||
on7,60147.000000,60207.000000,60
|
||||
on7,61586.000000,61646.000000,60
|
||||
on7,66123.000000,66183.000000,60
|
||||
on7,71704.000000,71764.000000,60
|
||||
on7,74590.000000,74650.000000,60
|
||||
on7,79073.000000,79133.000000,60
|
||||
on7,79548.000000,79608.000000,60
|
||||
on7,85066.000000,85126.000000,60
|
||||
on8,2674.000000,2734.000000,60
|
||||
on8,4338.000000,4398.000000,60
|
||||
on8,9095.000000,9155.000000,60
|
||||
on8,14071.000000,14131.000000,60
|
||||
on8,14835.000000,14895.000000,60
|
||||
on8,19156.000000,19216.000000,60
|
||||
on8,25147.000000,25207.000000,60
|
||||
on8,27134.000000,27194.000000,60
|
||||
on8,32284.000000,32344.000000,60
|
||||
on8,34027.000000,34087.000000,60
|
||||
on8,37314.000000,37374.000000,60
|
||||
on8,42389.000000,42449.000000,60
|
||||
on8,43714.000000,43774.000000,60
|
||||
on8,49995.000000,50055.000000,60
|
||||
on8,52423.000000,52483.000000,60
|
||||
on8,57057.000000,57117.000000,60
|
||||
on8,58773.000000,58833.000000,60
|
||||
on8,62502.000000,62562.000000,60
|
||||
on8,67271.000000,67331.000000,60
|
||||
on8,71966.000000,72026.000000,60
|
||||
on8,75575.000000,75635.000000,60
|
||||
on8,77670.000000,77730.000000,60
|
||||
on8,79297.000000,79357.000000,60
|
||||
on8,83230.000000,83290.000000,60
|
||||
on9,2456.000000,2516.000000,60
|
||||
on9,6530.000000,6590.000000,60
|
||||
on9,8844.000000,8904.000000,60
|
||||
on9,12246.000000,12306.000000,60
|
||||
on9,15111.000000,15171.000000,60
|
||||
on9,19992.000000,20052.000000,60
|
||||
on9,23221.000000,23281.000000,60
|
||||
on9,28585.000000,28645.000000,60
|
||||
on9,29439.000000,29499.000000,60
|
||||
on9,35916.000000,35976.000000,60
|
||||
on9,36964.000000,37024.000000,60
|
||||
on9,42184.000000,42244.000000,60
|
||||
on9,45782.000000,45842.000000,60
|
||||
on9,49221.000000,49281.000000,60
|
||||
on9,51318.000000,51378.000000,60
|
||||
on9,54374.000000,54434.000000,60
|
||||
on9,59557.000000,59617.000000,60
|
||||
on9,61341.000000,61401.000000,60
|
||||
on9,65872.000000,65932.000000,60
|
||||
on9,68780.000000,68840.000000,60
|
||||
on9,73246.000000,73306.000000,60
|
||||
on9,78696.000000,78756.000000,60
|
||||
on9,82638.000000,82698.000000,60
|
||||
on9,83128.000000,83188.000000,60
|
||||
on0,1131.000000,1191.000000,60
|
||||
on0,4493.000000,4553.000000,60
|
||||
on0,7770.000000,7830.000000,60
|
||||
on0,13560.000000,13620.000000,60
|
||||
on0,17326.000000,17386.000000,60
|
||||
on0,18924.000000,18984.000000,60
|
||||
on0,23874.000000,23934.000000,60
|
||||
on0,27153.000000,27213.000000,60
|
||||
on0,28996.000000,29056.000000,60
|
||||
on0,33057.000000,33117.000000,60
|
||||
on0,37263.000000,37323.000000,60
|
||||
on0,42996.000000,43056.000000,60
|
||||
on0,46749.000000,46809.000000,60
|
||||
on0,48689.000000,48749.000000,60
|
||||
on0,51894.000000,51954.000000,60
|
||||
on0,57147.000000,57207.000000,60
|
||||
on0,59429.000000,59489.000000,60
|
||||
on0,62861.000000,62921.000000,60
|
||||
on0,67527.000000,67587.000000,60
|
||||
on0,70166.000000,70226.000000,60
|
||||
on0,75491.000000,75551.000000,60
|
||||
on0,76921.000000,76981.000000,60
|
||||
on0,79528.000000,79588.000000,60
|
||||
on0,86053.000000,86113.000000,60
|
||||
on1,2746.000000,2806.000000,60
|
||||
on1,4424.000000,4484.000000,60
|
||||
on1,9061.000000,9121.000000,60
|
||||
on1,14235.000000,14295.000000,60
|
||||
on1,15151.000000,15211.000000,60
|
||||
on1,18576.000000,18636.000000,60
|
||||
on1,22038.000000,22098.000000,60
|
||||
on1,28592.000000,28652.000000,60
|
||||
on1,30270.000000,30330.000000,60
|
||||
on1,34918.000000,34978.000000,60
|
||||
on1,36460.000000,36520.000000,60
|
||||
on1,41905.000000,41965.000000,60
|
||||
on1,46642.000000,46702.000000,60
|
||||
on1,49535.000000,49595.000000,60
|
||||
on1,52567.000000,52627.000000,60
|
||||
on1,54037.000000,54097.000000,60
|
||||
on1,58901.000000,58961.000000,60
|
||||
on1,64630.000000,64690.000000,60
|
||||
on1,66142.000000,66202.000000,60
|
||||
on1,69649.000000,69709.000000,60
|
||||
on1,75228.000000,75288.000000,60
|
||||
on1,76346.000000,76406.000000,60
|
||||
on1,81506.000000,81566.000000,60
|
||||
on1,84256.000000,84316.000000,60
|
||||
on2,2988.000000,3168.000000,180
|
||||
on2,5124.000000,5304.000000,180
|
||||
on2,7307.000000,7487.000000,180
|
||||
on2,11906.000000,12086.000000,180
|
||||
on2,16052.000000,16232.000000,180
|
||||
on2,16260.000000,16440.000000,180
|
||||
on2,18125.000000,18305.000000,180
|
||||
on2,18629.000000,18809.000000,180
|
||||
on2,22535.000000,22715.000000,180
|
||||
on2,24126.000000,24306.000000,180
|
||||
on2,27021.000000,27201.000000,180
|
||||
on2,30940.000000,31120.000000,180
|
||||
on2,33021.000000,33201.000000,180
|
||||
on2,38381.000000,38561.000000,180
|
||||
on2,41334.000000,41514.000000,180
|
||||
on2,46009.000000,46189.000000,180
|
||||
on2,49004.000000,49184.000000,180
|
||||
on2,50976.000000,51156.000000,180
|
||||
on2,56335.000000,56515.000000,180
|
||||
on2,59641.000000,59821.000000,180
|
||||
on2,63959.000000,64139.000000,180
|
||||
on2,67516.000000,67696.000000,180
|
||||
on2,69194.000000,69374.000000,180
|
||||
on2,74457.000000,74637.000000,180
|
||||
on2,75623.000000,75803.000000,180
|
||||
on2,80256.000000,80436.000000,180
|
||||
on2,85098.000000,85278.000000,180
|
||||
on10,1202.000000,1382.000000,180
|
||||
on10,3963.000000,4143.000000,180
|
||||
on10,8211.000000,8391.000000,180
|
||||
on10,12692.000000,12872.000000,180
|
||||
on10,16304.000000,16484.000000,180
|
||||
on10,20652.000000,20832.000000,180
|
||||
on10,22800.000000,22980.000000,180
|
||||
on10,28551.000000,28731.000000,180
|
||||
on10,29999.000000,30179.000000,180
|
||||
on10,35257.000000,35437.000000,180
|
||||
on10,39292.000000,39472.000000,180
|
||||
on10,41152.000000,41332.000000,180
|
||||
on10,43224.000000,43404.000000,180
|
||||
on10,47156.000000,47336.000000,180
|
||||
on10,51981.000000,52161.000000,180
|
||||
on10,55236.000000,55416.000000,180
|
||||
on10,60536.000000,60716.000000,180
|
||||
on10,62364.000000,62544.000000,180
|
||||
on10,66865.000000,67045.000000,180
|
||||
on10,68970.000000,69150.000000,180
|
||||
on10,74632.000000,74812.000000,180
|
||||
on10,75899.000000,76079.000000,180
|
||||
on10,79855.000000,80035.000000,180
|
||||
on10,85242.000000,85422.000000,180
|
||||
on3,2462.000000,2642.000000,180
|
||||
on3,3879.000000,4059.000000,180
|
||||
on3,8872.000000,9052.000000,180
|
||||
on3,12460.000000,12640.000000,180
|
||||
on3,14753.000000,14933.000000,180
|
||||
on3,19080.000000,19260.000000,180
|
||||
on3,23366.000000,23546.000000,180
|
||||
on3,28542.000000,28722.000000,180
|
||||
on3,29192.000000,29372.000000,180
|
||||
on3,34755.000000,34935.000000,180
|
||||
on3,35481.000000,35661.000000,180
|
||||
on3,37027.000000,37207.000000,180
|
||||
on3,41644.000000,41824.000000,180
|
||||
on3,43489.000000,43669.000000,180
|
||||
on3,48140.000000,48320.000000,180
|
||||
on3,52052.000000,52232.000000,180
|
||||
on3,56430.000000,56610.000000,180
|
||||
on3,59561.000000,59741.000000,180
|
||||
on3,61812.000000,61992.000000,180
|
||||
on3,65543.000000,65723.000000,180
|
||||
on3,69750.000000,69930.000000,180
|
||||
on3,72603.000000,72783.000000,180
|
||||
on3,78127.000000,78307.000000,180
|
||||
on3,80672.000000,80852.000000,180
|
||||
on3,85444.000000,85624.000000,180
|
||||
on11,610.000000,790.000000,180
|
||||
on11,3701.000000,3881.000000,180
|
||||
on11,7941.000000,8121.000000,180
|
||||
on11,11372.000000,11552.000000,180
|
||||
on11,14657.000000,14837.000000,180
|
||||
on11,18300.000000,18480.000000,180
|
||||
on11,22535.000000,22715.000000,180
|
||||
on11,23929.000000,24109.000000,180
|
||||
on11,27867.000000,28047.000000,180
|
||||
on11,29463.000000,29643.000000,180
|
||||
on11,35740.000000,35920.000000,180
|
||||
on11,37138.000000,37318.000000,180
|
||||
on11,39954.000000,40134.000000,180
|
||||
on11,45772.000000,45952.000000,180
|
||||
on11,46925.000000,47105.000000,180
|
||||
on11,50685.000000,50865.000000,180
|
||||
on11,55558.000000,55738.000000,180
|
||||
on11,60582.000000,60762.000000,180
|
||||
on11,62564.000000,62744.000000,180
|
||||
on11,67911.000000,68091.000000,180
|
||||
on11,69193.000000,69373.000000,180
|
||||
on11,73720.000000,73900.000000,180
|
||||
on11,78079.000000,78259.000000,180
|
||||
on11,81229.000000,81409.000000,180
|
||||
on11,84036.000000,84216.000000,180
|
||||
on4,3074.000000,3254.000000,180
|
||||
on4,4368.000000,4548.000000,180
|
||||
on4,8218.000000,8398.000000,180
|
||||
on4,8426.000000,8606.000000,180
|
||||
on4,11726.000000,11906.000000,180
|
||||
on4,12910.000000,13090.000000,180
|
||||
on4,16399.000000,16579.000000,180
|
||||
on4,18069.000000,18249.000000,180
|
||||
on4,22587.000000,22767.000000,180
|
||||
on4,26241.000000,26421.000000,180
|
||||
on4,30356.000000,30536.000000,180
|
||||
on4,32847.000000,33027.000000,180
|
||||
on4,36488.000000,36668.000000,180
|
||||
on4,41510.000000,41690.000000,180
|
||||
on4,45935.000000,46115.000000,180
|
||||
on4,46841.000000,47021.000000,180
|
||||
on4,52231.000000,52411.000000,180
|
||||
on4,54914.000000,55094.000000,180
|
||||
on4,60723.000000,60903.000000,180
|
||||
on4,61845.000000,62025.000000,180
|
||||
on4,65545.000000,65725.000000,180
|
||||
on4,69599.000000,69779.000000,180
|
||||
on4,73986.000000,74166.000000,180
|
||||
on4,77997.000000,78177.000000,180
|
||||
on4,80616.000000,80796.000000,180
|
||||
on4,83326.000000,83506.000000,180
|
||||
on12,222.000000,402.000000,180
|
||||
on12,5482.000000,5662.000000,180
|
||||
on12,10214.000000,10394.000000,180
|
||||
on12,11441.000000,11621.000000,180
|
||||
on12,17789.000000,17969.000000,180
|
||||
on12,18249.000000,18429.000000,180
|
||||
on12,22535.000000,22715.000000,180
|
||||
on12,24684.000000,24864.000000,180
|
||||
on12,25778.000000,25958.000000,180
|
||||
on12,29150.000000,29330.000000,180
|
||||
on12,34012.000000,34192.000000,180
|
||||
on12,38358.000000,38538.000000,180
|
||||
on12,41415.000000,41595.000000,180
|
||||
on12,45112.000000,45292.000000,180
|
||||
on12,48066.000000,48246.000000,180
|
||||
on12,51461.000000,51641.000000,180
|
||||
on12,56575.000000,56755.000000,180
|
||||
on12,59994.000000,60174.000000,180
|
||||
on12,64607.000000,64787.000000,180
|
||||
on12,65517.000000,65697.000000,180
|
||||
on12,71153.000000,71333.000000,180
|
||||
on12,72112.000000,72292.000000,180
|
||||
on12,76602.000000,76782.000000,180
|
||||
on12,80090.000000,80270.000000,180
|
||||
on12,83681.000000,83861.000000,180
|
||||
on5,796.000000,976.000000,180
|
||||
on5,6968.000000,7148.000000,180
|
||||
on5,10284.000000,10464.000000,180
|
||||
on5,12200.000000,12380.000000,180
|
||||
on5,16260.000000,16440.000000,180
|
||||
on5,16874.000000,17054.000000,180
|
||||
on5,19136.000000,19316.000000,180
|
||||
on5,23431.000000,23611.000000,180
|
||||
on5,28535.000000,28715.000000,180
|
||||
on5,31912.000000,32092.000000,180
|
||||
on5,33244.000000,33424.000000,180
|
||||
on5,39233.000000,39413.000000,180
|
||||
on5,42498.000000,42678.000000,180
|
||||
on5,44113.000000,44293.000000,180
|
||||
on5,48807.000000,48987.000000,180
|
||||
on5,52126.000000,52306.000000,180
|
||||
on5,56470.000000,56650.000000,180
|
||||
on5,57841.000000,58021.000000,180
|
||||
on5,63414.000000,63594.000000,180
|
||||
on5,66967.000000,67147.000000,180
|
||||
on5,71377.000000,71557.000000,180
|
||||
on5,72043.000000,72223.000000,180
|
||||
on5,76177.000000,76357.000000,180
|
||||
on5,80878.000000,81058.000000,180
|
||||
on5,85966.000000,86146.000000,180
|
||||
on6,2430.000000,2610.000000,180
|
||||
on6,6024.000000,6204.000000,180
|
||||
on6,8144.000000,8324.000000,180
|
||||
on6,11726.000000,11975.000000,249
|
||||
on6,15800.000000,15980.000000,180
|
||||
on6,20361.000000,20541.000000,180
|
||||
on6,24330.000000,24510.000000,180
|
||||
on6,27397.000000,27577.000000,180
|
||||
on6,28895.000000,29075.000000,180
|
||||
on6,32580.000000,32760.000000,180
|
||||
on6,37384.000000,37564.000000,180
|
||||
on6,39956.000000,40136.000000,180
|
||||
on6,45724.000000,45904.000000,180
|
||||
on6,47802.000000,47982.000000,180
|
||||
on6,50671.000000,50851.000000,180
|
||||
on6,56215.000000,56395.000000,180
|
||||
on6,59447.000000,59627.000000,180
|
||||
on6,61283.000000,61463.000000,180
|
||||
on6,67701.000000,67881.000000,180
|
||||
on6,68947.000000,69127.000000,180
|
||||
on6,74090.000000,74270.000000,180
|
||||
on6,76806.000000,76986.000000,180
|
||||
on6,82217.000000,82397.000000,180
|
||||
on6,82919.000000,83099.000000,180
|
||||
on7,0.000000,180.000000,180
|
||||
on7,6571.000000,6751.000000,180
|
||||
on7,10296.000000,10476.000000,180
|
||||
on7,12051.000000,12231.000000,180
|
||||
on7,15735.000000,15915.000000,180
|
||||
on7,16260.000000,16440.000000,180
|
||||
on7,18125.000000,18305.000000,180
|
||||
on7,19353.000000,19533.000000,180
|
||||
on7,22535.000000,22776.000000,241
|
||||
on7,25545.000000,25725.000000,180
|
||||
on7,30364.000000,30544.000000,180
|
||||
on7,35548.000000,35728.000000,180
|
||||
on7,37340.000000,37520.000000,180
|
||||
on7,42565.000000,42745.000000,180
|
||||
on7,46496.000000,46676.000000,180
|
||||
on7,48657.000000,48837.000000,180
|
||||
on7,53349.000000,53529.000000,180
|
||||
on7,57391.000000,57571.000000,180
|
||||
on7,59638.000000,59818.000000,180
|
||||
on7,63320.000000,63500.000000,180
|
||||
on7,65127.000000,65307.000000,180
|
||||
on7,69541.000000,69721.000000,180
|
||||
on7,75122.000000,75302.000000,180
|
||||
on7,76198.000000,76378.000000,180
|
||||
on7,80344.000000,80524.000000,180
|
||||
on7,84348.000000,84528.000000,180
|
||||
on8,1889.000000,2069.000000,180
|
||||
on8,4224.000000,4404.000000,180
|
||||
on8,10504.000000,10684.000000,180
|
||||
on8,12566.000000,12746.000000,180
|
||||
on8,16230.000000,16410.000000,180
|
||||
on8,20900.000000,21080.000000,180
|
||||
on8,23485.000000,23665.000000,180
|
||||
on8,28238.000000,28418.000000,180
|
||||
on8,31251.000000,31431.000000,180
|
||||
on8,35168.000000,35348.000000,180
|
||||
on8,36868.000000,37048.000000,180
|
||||
on8,39965.000000,40145.000000,180
|
||||
on8,45109.000000,45289.000000,180
|
||||
on8,49872.000000,50052.000000,180
|
||||
on8,52318.000000,52498.000000,180
|
||||
on8,54052.000000,54232.000000,180
|
||||
on8,60400.000000,60580.000000,180
|
||||
on8,62246.000000,62426.000000,180
|
||||
on8,65604.000000,65784.000000,180
|
||||
on8,68862.000000,69042.000000,180
|
||||
on8,74903.000000,75083.000000,180
|
||||
on8,77140.000000,77320.000000,180
|
||||
on8,79633.000000,79813.000000,180
|
||||
on8,85528.000000,85708.000000,180
|
||||
on9,239.000000,419.000000,180
|
||||
on9,5568.000000,5748.000000,180
|
||||
on9,8857.000000,9037.000000,180
|
||||
on9,14162.000000,14342.000000,180
|
||||
on9,14753.000000,14933.000000,180
|
||||
on9,20801.000000,20981.000000,180
|
||||
on9,24297.000000,24477.000000,180
|
||||
on9,25547.000000,25727.000000,180
|
||||
on9,27442.000000,27622.000000,180
|
||||
on9,30012.000000,30192.000000,180
|
||||
on9,34980.000000,35160.000000,180
|
||||
on9,37795.000000,37975.000000,180
|
||||
on9,40429.000000,40609.000000,180
|
||||
on9,46468.000000,46648.000000,180
|
||||
on9,48268.000000,48448.000000,180
|
||||
on9,50847.000000,51027.000000,180
|
||||
on9,54085.000000,54265.000000,180
|
||||
on9,59623.000000,59803.000000,180
|
||||
on9,63723.000000,63903.000000,180
|
||||
on9,66458.000000,66638.000000,180
|
||||
on9,70119.000000,70299.000000,180
|
||||
on9,75383.000000,75563.000000,180
|
||||
on9,75756.000000,75936.000000,180
|
||||
on9,80972.000000,81152.000000,180
|
||||
on9,83349.000000,83529.000000,180
|
||||
on0,2668.000000,2848.000000,180
|
||||
on0,4358.000000,4538.000000,180
|
||||
on0,8218.000000,8398.000000,180
|
||||
on0,11726.000000,11906.000000,180
|
||||
on0,16260.000000,16440.000000,180
|
||||
on0,18125.000000,18340.620640,215.621
|
||||
on0,22535.000000,22715.000000,180
|
||||
on0,25547.000000,25727.000000,180
|
||||
on0,29100.000000,29280.000000,180
|
||||
on0,34755.000000,34935.000000,180
|
||||
on0,36503.000000,36683.000000,180
|
||||
on0,41983.000000,42163.000000,180
|
||||
on0,43942.000000,44122.000000,180
|
||||
on0,46979.000000,47159.000000,180
|
||||
on0,52255.000000,52435.000000,180
|
||||
on0,55038.000000,55218.000000,180
|
||||
on0,60722.000000,60902.000000,180
|
||||
on0,64114.000000,64294.000000,180
|
||||
on0,68124.000000,68304.000000,180
|
||||
on0,68400.000000,68580.000000,180
|
||||
on0,73539.000000,73719.000000,180
|
||||
on0,77940.000000,78120.000000,180
|
||||
on0,79722.000000,79902.000000,180
|
||||
on0,84219.000000,84399.000000,180
|
||||
on1,169.000000,349.000000,180
|
||||
on1,3903.000000,4083.000000,180
|
||||
on1,7508.000000,7688.000000,180
|
||||
on1,11360.000000,11540.000000,180
|
||||
on1,16207.000000,16387.000000,180
|
||||
on1,18125.000000,18305.000000,180
|
||||
on1,20188.000000,20368.000000,180
|
||||
on1,24844.000000,25024.000000,180
|
||||
on1,27462.000000,27642.000000,180
|
||||
on1,31747.000000,31927.000000,180
|
||||
on1,34449.000000,34629.000000,180
|
||||
on1,36975.000000,37155.000000,180
|
||||
on1,42194.000000,42374.000000,180
|
||||
on1,45374.000000,45554.000000,180
|
||||
on1,48711.000000,48891.000000,180
|
||||
on1,51128.000000,51308.000000,180
|
||||
on1,56474.000000,56654.000000,180
|
||||
on1,59653.000000,59833.000000,180
|
||||
on1,62431.000000,62611.000000,180
|
||||
on1,67444.000000,67624.000000,180
|
||||
on1,71195.000000,71375.000000,180
|
||||
on1,74618.000000,74798.000000,180
|
||||
on1,77887.000000,78067.000000,180
|
||||
on1,80821.000000,81001.000000,180
|
||||
on1,85119.000000,85299.000000,180
|
||||
|
|
|
BIN
results/success-180sec.png
Normal file
After Width: | Height: | Size: 76 KiB |
BIN
results/success-60sec.png
Normal file
After Width: | Height: | Size: 76 KiB |
Before Width: | Height: | Size: 220 KiB After Width: | Height: | Size: 102 KiB |
|
@ -1,33 +1,13 @@
|
|||
|
||||
|simkey |wireless | wakeupfor| sd| energy|
|
||||
|:---------------|:--------|---------:|---------:|--------:|
|
||||
|baseline |lora | 60| 12.08547| 583.8016|
|
||||
|extended |lora | 60| 115.69712| 643.3609|
|
||||
|hint |lora | 60| 19.98529| 588.8910|
|
||||
|hintandextended |lora | 60| 122.76077| 652.4087|
|
||||
|baseline |lora | 60| 12.07853| 583.7970|
|
||||
|extended |lora | 60| 115.69817| 643.3429|
|
||||
|hint |lora | 60| 19.97809| 588.8869|
|
||||
|hintandextended |lora | 60| 120.22382| 651.6261|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd| energy|
|
||||
|:---------------|:--------|---------:|--------:|--------:|
|
||||
|baseline |nbiot | 60| 40.35285| 602.7284|
|
||||
|extended |nbiot | 60| 49.89496| 604.8062|
|
||||
|hint |nbiot | 60| 62.56728| 622.7394|
|
||||
|hintandextended |nbiot | 60| 60.60395| 622.9200|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd| energy|
|
||||
|:---------------|:--------|---------:|---------:|--------:|
|
||||
|baseline |lora | 180| 76.10034| 1784.001|
|
||||
|extended |lora | 180| 120.81175| 1798.744|
|
||||
|hint |lora | 180| 221.13014| 2071.106|
|
||||
|hintandextended |lora | 180| 144.56696| 1912.820|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd| energy|
|
||||
|:---------------|:--------|---------:|---------:|--------:|
|
||||
|baseline |nbiot | 180| 82.67308| 1786.374|
|
||||
|extended |nbiot | 180| 73.09319| 1772.271|
|
||||
|hint |nbiot | 180| 210.98239| 2045.656|
|
||||
|hintandextended |nbiot | 180| 203.59603| 2018.582|
|
||||
|simkey |wireless | wakeupfor| sd| energy|
|
||||
|:------|:--------|---------:|--:|------:|
|
||||
|
||||
|
||||
|
|
|
@ -1,33 +1,13 @@
|
|||
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:---------------|:--------|---------:|----------:|-------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|baseline |lora | 60| 0.000000| 0.000| 617.1992| 13.92286| 581.0185| 6.43567| 1440.000| 1439.928| NA| 1440| 1439.928| 1| 0.0000| 0.00000| 617.1992| 581.0185| 1| 0.00| 0.00| 0.0| 0.0| 619.73| 579.84| 1440.00| 1440.00| 0| 0| 0| 0| 0| 23.99625| 24|
|
||||
|extended |lora | 60| 1.539880| 6.125| 1009.7080| 112.14261| 612.8320| 36.56959| 2132.270| 1499.413| 39764.48| 1440| 1439.928| 2| 692.2700| 59.48542| 617.1992| 581.0185| 2| 38.87| 5.19| 2.0| 7.7| 1207.61| 627.35| 2564.53| 1523.52| 20| 2| 20| 2| 0| 23.99625| 24|
|
||||
|hint |lora | 60| 0.000000| 0.000| 628.2949| 19.46385| 585.6074| 16.15719| 1440.000| 1450.278| NA| 1440| 1439.928| 3| 0.0000| 10.34992| 617.1992| 581.0185| 3| 1.77| 0.78| 0.0| 0.0| 753.42| 957.64| 1440.00| 2354.94| 20| 64| 0| 62| 0| 24.16542| 24|
|
||||
|hintandextended |lora | 60| 1.639455| 6.625| 1040.5143| 116.74540| 620.0665| 39.90174| 2177.281| 1512.382| 39160.28| 1440| 1439.928| 4| 737.2809| 72.45389| 617.1992| 581.0185| 4| 40.68| 6.30| 2.2| 9.8| 1397.98| 663.58| 2904.50| 1602.39| 34| 7| 33| 6| 0| 24.14500| 24|
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:---------------|:--------|---------:|----------:|--------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|baseline |lora | 60| 0.00000| 0.000000| 617.1670| 13.89553| 581.0162| 6.439364| 1440.000| 1439.928| NA| 1440| 1439.928| 1| 0.0000| 0.00000| 617.167| 581.0162| 1| 0.00| 0.00| 0.0| 0.0| 619.73| 579.84| 1440.00| 1440.00| 0| 0| 0| 0| 0| 23.99627| 24|
|
||||
|extended |lora | 60| 1.53988| 6.125000| 1009.7080| 112.14261| 612.8125| 36.556906| 2132.270| 1499.365| 39764.48| 1440| 1439.928| 2| 692.2700| 59.43631| 617.167| 581.0162| 2| 38.88| 5.19| 2.0| 7.7| 1207.61| 627.35| 2564.53| 1523.52| 20| 2| 20| 2| 0| 23.99625| 24|
|
||||
|hint |lora | 60| 0.00000| 0.000000| 628.2949| 19.46385| 585.6029| 16.146640| 1440.000| 1450.267| NA| 1440| 1439.928| 3| 0.0000| 10.33839| 617.167| 581.0162| 3| 1.77| 0.78| 0.0| 0.0| 753.42| 957.64| 1440.00| 2354.94| 20| 64| 0| 62| 0| 24.16542| 24|
|
||||
|hintandextended |lora | 60| 1.31897| 6.555556| 1035.2500| 95.01626| 619.6575| 40.139086| 2168.564| 1511.834| 38202.38| 1440| 1439.928| 4| 728.5645| 71.90580| 617.167| 581.0162| 4| 40.38| 6.24| 2.2| 9.8| 1397.98| 663.58| 2904.50| 1602.39| 35| 7| 34| 6| 0| 24.14352| 24|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:---------------|:--------|---------:|----------:|-------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|baseline |nbiot | 60| 1.326565| 2.405| 716.2964| 43.43334| 593.2644| 21.04193| 1440.000| 1439.928| 41794.55| 1440| 1439.928| 1| 0.00000| 0.000000| 716.2964| 593.2644| 1| 0.00| 0.00| 1.12| 1.27| 749.69| 591.07| 1440.00| 1440.00| 5| 0| 0| 0| 0| 23.99625| 24|
|
||||
|extended |nbiot | 60| 1.635013| 6.490| 763.3750| 49.83593| 591.5921| 14.83692| 1486.482| 1443.817| 38750.19| 1440| 1439.928| 2| 46.48215| 3.889388| 716.2964| 593.2644| 2| 6.17| -0.28| 1.80| 7.16| 946.39| 599.13| 1788.32| 1447.54| 24| 1| 20| 0| 0| 23.99625| 24|
|
||||
|hint |nbiot | 60| 2.428676| 4.605| 766.0904| 72.31226| 610.7935| 44.17384| 1440.000| 1463.261| 41424.25| 1440| 1439.928| 3| 0.00000| 23.333204| 716.2964| 593.2644| 3| 6.50| 2.87| 3.45| 9.72| 1007.06| 702.59| 1440.00| 1666.51| 31| 15| 0| 14| 0| 24.37250| 24|
|
||||
|hintandextended |nbiot | 60| 1.879164| 7.580| 790.4368| 54.84866| 608.9603| 34.56977| 1483.177| 1462.101| 37225.93| 1440| 1439.928| 4| 43.17667| 22.172950| 716.2964| 593.2644| 4| 9.38| 2.58| 2.36| 9.41| 1066.66| 623.30| 1901.47| 1492.53| 35| 2| 28| 2| 0| 24.29042| 24|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:---------------|:--------|---------:|----------:|-------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|baseline |lora | 180| 1.2632315| 1.915| 2024.816| 51.29690| 1763.933| 28.60502| 4319.945| 4317.908| 42122.74| 4319.945| 4317.908| 1| 0.0000| 0.00000| 2024.816| 1763.933| 1| 0.00| 0.00| 1.40| 1.91| 2026.23| 1755.92| 4320.00| 4320.00| 0| 0| 0| 0| 0| 23.96708| 23.99|
|
||||
|extended |lora | 180| 1.1395031| 10.695| 2200.902| 86.90754| 1765.231| 24.06196| 4817.775| 4356.038| 29727.01| 4319.945| 4317.908| 2| 497.8300| 38.13042| 2024.816| 1763.933| 2| 8.00| 0.07| 0.70| 11.45| 2692.46| 1772.35| 6038.78| 4364.27| 22| 0| 25| 0| 0| 23.96708| 23.99|
|
||||
|hint |lora | 180| 1.3531928| 11.055| 2133.820| 50.32577| 2065.879| 228.93189| 4319.945| 4932.097| 38450.82| 4319.945| 4317.908| 3| 0.0000| 614.18917| 2024.816| 1763.933| 3| 5.11| 14.62| 0.00| 12.00| 2094.09| 2169.50| 4320.00| 5344.86| 2| 5| 0| 8| 0| 27.20625| 23.99|
|
||||
|hintandextended |lora | 180| 0.5207021| 11.765| 2251.250| 70.23605| 1884.618| 109.03452| 4875.151| 4569.616| 21068.30| 4319.945| 4317.908| 4| 555.2062| 251.70799| 2024.816| 1763.933| 4| 10.06| 6.40| 0.24| 11.94| 2757.79| 1867.34| 6155.50| 4600.09| 23| 1| 26| 1| 0| 25.06333| 23.99|
|
||||
|
||||
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:---------------|:--------|---------:|----------:|-------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|baseline |nbiot | 180| 1.3010915| 10.025| 2029.482| 39.95947| 1766.115| 43.982210| 4319.945| 4317.908| 30213.49| 4319.945| 4317.908| 1| 0.00000| 0.0000| 2029.482| 1766.115| 1| 0.00| 0.00| 1.33| 9.90| 2117.65| 1761.78| 4320.00| 4320.00| 4| 0| 0| 0| 0| 23.96708| 23.99|
|
||||
|extended |nbiot | 180| 1.1007535| 10.880| 2021.314| 32.59292| 1751.517| 9.914506| 4345.909| 4319.845| 27126.21| 4319.945| 4317.908| 2| 25.96430| 1.9374| 2029.482| 1766.115| 2| -0.40| -0.83| 0.87| 11.23| 2311.52| 1760.92| 4868.78| 4323.71| 14| 1| 12| 0| 0| 23.96708| 23.99|
|
||||
|hint |nbiot | 180| 0.4927617| 11.780| 2053.867| 21.19100| 2044.972| 219.502254| 4319.945| 4527.499| 20936.63| 4319.945| 4317.908| 3| 0.00000| 209.5909| 2029.482| 1766.115| 3| 1.19| 13.64| 0.37| 11.92| 2180.07| 1868.54| 4320.00| 4576.83| 6| 9| 0| 1| 0| 25.07833| 23.99|
|
||||
|hintandextended |nbiot | 180| 0.4580656| 11.785| 2040.722| 14.09534| 2016.737| 211.769483| 4335.303| 4504.253| 19100.67| 4319.945| 4317.908| 4| 15.35839| 186.3448| 2029.482| 1766.115| 4| 0.55| 12.43| 0.41| 11.88| 2151.14| 1822.44| 4906.10| 4473.32| 5| 10| 13| 1| 0| 24.94875| 23.99|
|
||||
|simkey |wireless | wakeupfor| sd_success| success| senderEnergy| senderEnergy_sd| receiverEnergy| receiverEnergy_sd| senderUptime| receiverUptime| avgTimeDataRcv| senderUptime_baseline| receiverUptime_baseline| id| senderUptimeOverhead| receiverUptimeOverhead| senderEnergy_baseline| receiverEnergy_baseline| id_baseline| senderEnergyOverheadPercent| receiverEnergyOverheadPercent| sd_success_ccgrid| success_ccgrid| senderEnergy_ccgrid| receiverEnergy_ccgrid| senderUptime_ccgrid| receiverUptime_ccgrid| senderEnergy_err| receiverEnergy_err| senderUptime_err| receiverUptime_err| nSendFail| nWakeUpRcv| nWakeUpSender|
|
||||
|:------|:--------|---------:|----------:|-------:|------------:|---------------:|--------------:|-----------------:|------------:|--------------:|--------------:|---------------------:|-----------------------:|--:|--------------------:|----------------------:|---------------------:|-----------------------:|-----------:|---------------------------:|-----------------------------:|-----------------:|--------------:|-------------------:|---------------------:|-------------------:|---------------------:|----------------:|------------------:|----------------:|------------------:|---------:|----------:|-------------:|
|
||||
|
||||
|
||||
|
|
BIN
scenarios
|
@ -29,7 +29,7 @@ int main(int argc, char **argv){
|
|||
int seed=atoi(argv[1]);
|
||||
double simtime=stod(argv[2]);
|
||||
unsigned int wakeupevery=atoi(argv[3]);
|
||||
double wakeupfor=stod(argv[4]);
|
||||
unsigned int wakeupfor=stoi(argv[4]);
|
||||
unsigned int n_nodes=atoi(argv[5]);
|
||||
bool extended=!strcmp("true",argv[6]);
|
||||
bool hint=!strcmp("true",argv[7]);
|
||||
|
@ -74,7 +74,7 @@ int main(int argc, char **argv){
|
|||
Value ts(kArrayType);
|
||||
Value duration(kArrayType);
|
||||
for(unsigned int i=0;i<simtime;i+=wakeupevery){
|
||||
ts.PushBack(Value().SetDouble(RAND(i,i+wakeupevery)),d.GetAllocator());
|
||||
ts.PushBack(Value().SetDouble(RAND(i,i+wakeupevery-wakeupfor)),d.GetAllocator());
|
||||
duration.PushBack(Value().SetDouble(wakeupfor),d.GetAllocator());
|
||||
}
|
||||
node.AddMember("wake_ts",ts,d.GetAllocator());
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
#include <sstream>
|
||||
|
||||
#include "Inputs.hpp"
|
||||
#include "simgrid/s4u/Actor.hpp"
|
||||
|
||||
|
||||
#define PLATFORM_FILE "platform.xml"
|
||||
|
@ -25,10 +26,8 @@
|
|||
}
|
||||
#define TRACK_UPTIME(instruction) \
|
||||
{ \
|
||||
double uptimeTrack=CLOCK; \
|
||||
instruction; \
|
||||
uptimeTrack=CLOCK-uptimeTrack; \
|
||||
uptime-=uptimeTrack; \
|
||||
uptime=upuntil-CLOCK; \
|
||||
uptime=uptime > 0 ? uptime : 0; \
|
||||
}
|
||||
/// @brief Note that we need to simulate latency our self since we need to send instantaneous messages
|
||||
|
@ -54,6 +53,7 @@
|
|||
catch(...){ \
|
||||
XBT_INFO("%s fail to forward a hint",CNAME); \
|
||||
MODE_ON(); \
|
||||
uptime=upuntil-CLOCK; \
|
||||
TRACK_UPTIME(simgrid::s4u::this_actor::sleep_for(FOR(TRY_FORWARD_DURING))); \
|
||||
} \
|
||||
} \
|
||||
|
@ -156,7 +156,7 @@ static void obs_node(std::vector<std::string> args) {
|
|||
bool forward_mode=false; // Turned on and off every x seconds by the receiver (to switch between forward hint mode and receiving data mode)
|
||||
bool forward_only=false; // When observer receive a hint it switch to forward only up to the next wake up time
|
||||
bool sendhint_mode=false; // Turned on and off every x seconds by the sender (to switch between send hint and send data)
|
||||
while(uptime>0)
|
||||
while(CLOCK < upuntil)
|
||||
{
|
||||
// ---------- SENDER ----------
|
||||
if(is_sender){
|
||||
|
@ -273,8 +273,9 @@ static void obs_node(std::vector<std::string> args) {
|
|||
if(i.extended){
|
||||
p=m_ded->get<Payload>(); // Fetch data until sended
|
||||
}
|
||||
else
|
||||
p=m_ded->get<Payload>(uptime); // Fetch data until sended or uptime expire
|
||||
else{
|
||||
TRACK_UPTIME(p=m_ded->get<Payload>(uptime)); // Fetch data until sended or uptime expire
|
||||
}
|
||||
// If we reach here, data has been received successfully
|
||||
XBT_INFO("%s received data successfully",CNAME);
|
||||
timeDataRcv=CLOCK;
|
||||
|
@ -335,10 +336,11 @@ static void obs_node(std::vector<std::string> args) {
|
|||
forward_mode=!forward_mode;
|
||||
}
|
||||
else {
|
||||
simgrid::s4u::this_actor::sleep_for(uptime);
|
||||
simgrid::s4u::this_actor::sleep_until(upuntil);
|
||||
}
|
||||
}
|
||||
uptime=upuntil-CLOCK; // Note that uptime can be < 0 in extended mode
|
||||
uptime=uptime > 0 ? uptime : 0; // Just in case
|
||||
}
|
||||
// Load next event
|
||||
i.GotoNextEvent();
|
||||
|
|