Skip to content

Commit 32b758d

Browse files
vlabatutvlabatut
committed
added weight names to stat folders
1 parent 30425d0 commit 32b758d

24 files changed

Lines changed: 437 additions & 56 deletions

‎src/common/file_system.R‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ get.path.data.graph <- function(mode, net.type, order=NA, window.size=NA, overla
186186
#
187187
# returns: full path.
188188
###############################################################################
189-
get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA, overlap=NA, weights="none", arc=NA, vol=NA, filtered=FALSE)
189+
get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA, overlap=NA, weights=NA, arc=NA, vol=NA, filtered=FALSE)
190190
{ # base folder
191191
if(mode=="panel.window")
192192
folder <- STAT_PANELS_FOLDER
@@ -225,7 +225,8 @@ get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA
225225
else if(!is.na(overlap))
226226
folder <- file.path(folder, paste0("ol=",overlap))
227227
# add weights
228-
folder <- file.path(folder, weights)
228+
if(!is.na(weights))
229+
folder <- file.path(folder, "weights", weights)
229230
# possibly add object
230231
folder <- file.path(folder, object)
231232
# possibly create folder
@@ -266,7 +267,7 @@ get.path.stat.table <- function(object, mode, net.type, order=NA, window.size=NA
266267
#
267268
# returns: full path.
268269
###############################################################################
269-
get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.size=NA, overlap=NA, weights="none", arc=NA, vol=NA, filtered=NA, pref=NA, suf=NA)
270+
get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.size=NA, overlap=NA, weights=NA, arc=NA, vol=NA, filtered=NA, pref=NA, suf=NA)
270271
{ # base folder
271272
if(mode=="panel.window")
272273
folder <- STAT_PANELS_FOLDER
@@ -294,8 +295,6 @@ get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.s
294295
if(!is.logical(vol))
295296
folder <- file.path(folder, "separate", vol)
296297
}
297-
# add weight subfolder
298-
folder <- file.path(folder, weights)
299298
# # possibly add extra subfolder
300299
# if(!is.na(subfold))
301300
# folder <- file.path(folder, subfold)
@@ -309,6 +308,9 @@ get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.s
309308
# possibly add overlap
310309
else if(!is.na(overlap))
311310
folder <- file.path(folder, paste0("ol=",overlap))
311+
# add weight subfolder
312+
if(!is.na(weights))
313+
folder <- file.path(folder, "weights", weights)
312314
# possibly add measure object
313315
if(!is.na(meas.name))
314316
folder <- file.path(folder, ALL_MEASURES[[meas.name]]$object, ALL_MEASURES[[meas.name]]$folder)
@@ -361,7 +363,7 @@ get.path.stats.topo <- function(mode, net.type, order=NA, meas.name=NA, window.s
361363
#
362364
# returns: full path.
363365
###############################################################################
364-
get.path.stats.comp <- function(mode, net.type, order=NA, meas.name=NA, window.size=NA, overlap=NA, weights="none", arc=NA, vol=NA, filtered=NA, pref=NA, suf=NA) # TODO add missing params
366+
get.path.stats.comp <- function(mode, net.type, order=NA, meas.name=NA, window.size=NA, overlap=NA, weights=NA, arc=NA, vol=NA, filtered=NA, pref=NA, suf=NA) # TODO add missing params
365367
{ # base folder
366368
if(mode=="panel.window")
367369
folder <- COMP_PANELS_FOLDER

‎src/measures/comparison/cosine.R‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_DUR)]] <- list( #Cosine similari
7171
cname="Cosine Similarity with Scene-Based Duration Graph",
7272
folder=MEAS_COSINE_SIM,
7373
object="graph",
74+
weighted=FALSE,
7475
foo=function(graph)
7576
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_DUR), graph, filtered=FALSE)
7677
return(values)
@@ -82,6 +83,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_DUR)]] <- list( #Wei
8283
cname="Weighted Cosine Similarity with Scene-Based Duration Graph",
8384
folder=MEAS_COSINE_SIM,
8485
object="graph",
86+
weighted=TRUE,
8587
foo=function(graph)
8688
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
8789
return(values)
@@ -93,6 +95,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_DUR)]] <-
9395
cname="Weighted normalized Cosine Similarity with Scene-Based Duration Graph",
9496
folder=MEAS_COSINE_SIM,
9597
object="graph",
98+
weighted=TRUE,
9699
foo=function(graph)
97100
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
98101
return(values)
@@ -104,6 +107,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_OCC)]] <- list( #Cosine similari
104107
cname="Cosine Similarity with Scene-Based Occurrences Graph",
105108
folder=MEAS_COSINE_SIM,
106109
object="graph",
110+
weighted=FALSE,
107111
foo=function(graph)
108112
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_OCC), graph, filtered=FALSE)
109113
return(values)
@@ -115,6 +119,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_OCC)]] <- list( #Wei
115119
cname="Weighted Cosine Similarity with Scene-Based Occurrences Graph",
116120
folder=MEAS_COSINE_SIM,
117121
object="graph",
122+
weighted=TRUE,
118123
foo=function(graph)
119124
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
120125
return(values)
@@ -126,6 +131,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_OCC)]] <-
126131
cname="Weighted normalized Cosine Similarity with Scene-Based Occurrences Graph",
127132
folder=MEAS_COSINE_SIM,
128133
object="graph",
134+
weighted=TRUE,
129135
foo=function(graph)
130136
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
131137
return(values)
@@ -141,6 +147,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_DUR)]] <- list( #C
141147
cname="Cosine Similarity with Filtered Scene-Based Duration Graph",
142148
folder=MEAS_COSINE_SIM,
143149
object="graph",
150+
weighted=FALSE,
144151
foo=function(graph)
145152
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_DUR), graph, filtered=TRUE)
146153
return(values)
@@ -152,6 +159,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_DUR)]]
152159
cname="Weighted Cosine Similarity with Filtered Scene-Based Duration Graph",
153160
folder=MEAS_COSINE_SIM,
154161
object="graph",
162+
weighted=TRUE,
155163
foo=function(graph)
156164
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_DUR), graph, filtered=TRUE)
157165
return(values)
@@ -163,6 +171,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM,
163171
cname="Weighted normalized Cosine Similarity with Filtered Scene-Based Duration Graph",
164172
folder=MEAS_COSINE_SIM,
165173
object="graph",
174+
weighted=TRUE,
166175
foo=function(graph)
167176
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=TRUE)
168177
return(values)
@@ -174,6 +183,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_OCC)]] <- list( #C
174183
cname="Cosine Similarity with Filtered Scene-Based Occurrences Graph",
175184
folder=MEAS_COSINE_SIM,
176185
object="graph",
186+
weighted=FALSE,
177187
foo=function(graph)
178188
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_OCC), graph, filtered=TRUE)
179189
return(values)
@@ -185,6 +195,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_OCC)]]
185195
cname="Weighted Cosine Similarity with Filtered Scene-Based Occurrences Graph",
186196
folder=MEAS_COSINE_SIM,
187197
object="graph",
198+
weighted=TRUE,
188199
foo=function(graph)
189200
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_OCC), graph, filtered=TRUE)
190201
return(values)
@@ -196,6 +207,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM,
196207
cname="Weighted normalized Cosine Similarity with Filtered Scene-Based Occurrences Graph",
197208
folder=MEAS_COSINE_SIM,
198209
object="graph",
210+
weighted=TRUE,
199211
foo=function(graph)
200212
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=TRUE)
201213
return(values)

‎src/measures/comparison/euclidean.R‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_DUR)]] <- list( #Euclidean d
7171
cname="Euclidean Distance with Scene-Based Duration Graph",
7272
folder=MEAS_EUCLIDEAN_DIST,
7373
object="graph",
74+
weighted=FALSE,
7475
foo=function(graph)
7576
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_DUR), graph, filtered=FALSE)
7677
return(values)
@@ -82,6 +83,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_DUR)]] <- list(
8283
cname="Weighted Euclidean Distance with Scene-Based Duration Graph",
8384
folder=MEAS_EUCLIDEAN_DIST,
8485
object="graph",
86+
weighted=TRUE,
8587
foo=function(graph)
8688
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
8789
return(values)
@@ -93,6 +95,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_DUR)]]
9395
cname="Weighted normalized Euclidean Distance with Scene-Based Duration Graph",
9496
folder=MEAS_EUCLIDEAN_DIST,
9597
object="graph",
98+
weighted=TRUE,
9699
foo=function(graph)
97100
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
98101
return(values)
@@ -104,6 +107,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_OCC)]] <- list( #Euclidean d
104107
cname="Euclidean Distance with Scene-Based Occurrences Graph",
105108
folder=MEAS_EUCLIDEAN_DIST,
106109
object="graph",
110+
weighted=FALSE,
107111
foo=function(graph)
108112
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_OCC), graph, filtered=FALSE)
109113
return(values)
@@ -115,6 +119,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_OCC)]] <- list(
115119
cname="Weighted Euclidean Distance with Scene-Based Occurrences Graph",
116120
folder=MEAS_EUCLIDEAN_DIST,
117121
object="graph",
122+
weighted=TRUE,
118123
foo=function(graph)
119124
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
120125
return(values)
@@ -126,6 +131,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_OCC)]]
126131
cname="Weighted normalized Euclidean Distance with Scene-Based Occurrences Graph",
127132
folder=MEAS_EUCLIDEAN_DIST,
128133
object="graph",
134+
weighted=TRUE,
129135
foo=function(graph)
130136
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
131137
return(values)

‎src/measures/comparison/falseneg.R‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_DUR)]] <- list( #false negative com
7171
cname="False Negatives relative to Scene-Based Duration Graph",
7272
folder=MEAS_FALSENEG,
7373
object="nodes",
74+
weighted=FALSE,
7475
foo=function(graph)
7576
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_DUR), graph, filtered=FALSE)
7677
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -86,6 +87,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_DUR)]] <- list( #Weight
8687
cname="Weighted False Negatives relative to Scene-Based Duration Graph",
8788
folder=MEAS_FALSENEG,
8889
object="nodes",
90+
weighted=TRUE,
8991
foo=function(graph)
9092
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
9193
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -101,6 +103,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_DUR)]] <- lis
101103
cname="Weighted normalized False Negatives relative to Scene-Based Duration Graph",
102104
folder=MEAS_FALSENEG,
103105
object="nodes",
106+
weighted=TRUE,
104107
foo=function(graph)
105108
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
106109
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -116,6 +119,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_OCC)]] <- list( #false negative com
116119
cname="False Negatives relative to Scene-Based Occurrences Graph",
117120
folder=MEAS_FALSENEG,
118121
object="nodes",
122+
weighted=FALSE,
119123
foo=function(graph)
120124
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_OCC), graph, filtered=FALSE)
121125
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -131,6 +135,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_OCC)]] <- list( #Weight
131135
cname="Weighted False Negatives relative to Scene-Based Occurrences Graph",
132136
folder=MEAS_FALSENEG,
133137
object="nodes",
138+
weighted=TRUE,
134139
foo=function(graph)
135140
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
136141
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -146,6 +151,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_OCC)]] <- lis
146151
cname="Weighted normalized False Negatives relative to Scene-Based Occurrences Graph",
147152
folder=MEAS_FALSENEG,
148153
object="nodes",
154+
weighted=TRUE,
149155
foo=function(graph)
150156
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
151157
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -165,6 +171,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_DUR)]] <- list( #fals
165171
cname="False Negatives relative to Filtered Scene-Based Duration Graph",
166172
folder=MEAS_FALSENEG,
167173
object="nodes",
174+
weighted=FALSE,
168175
foo=function(graph)
169176
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_DUR), graph, filtered=TRUE)
170177
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -180,6 +187,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_DUR)]] <-
180187
cname="Weighted False Negatives relative to Filtered Scene-Based Duration Graph",
181188
folder=MEAS_FALSENEG,
182189
object="nodes",
190+
weighted=TRUE,
183191
foo=function(graph)
184192
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_DUR), graph, filtered=TRUE)
185193
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -195,6 +203,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX
195203
cname="Weighted normalized False Negatives relative to Filtered Scene-Based Duration Graph",
196204
folder=MEAS_FALSENEG,
197205
object="nodes",
206+
weighted=TRUE,
198207
foo=function(graph)
199208
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=TRUE)
200209
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -210,6 +219,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_OCC)]] <- list( #fals
210219
cname="False Negatives relative to Filtered Scene-Based Occurrences Graph",
211220
folder=MEAS_FALSENEG,
212221
object="nodes",
222+
weighted=FALSE,
213223
foo=function(graph)
214224
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_OCC), graph, filtered=TRUE)
215225
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -225,6 +235,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_OCC)]] <-
225235
cname="Weighted False Negatives relative to Filtered Scene-Based Occurrences Graph",
226236
folder=MEAS_FALSENEG,
227237
object="nodes",
238+
weighted=TRUE,
228239
foo=function(graph)
229240
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_OCC), graph, filtered=TRUE)
230241
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -240,6 +251,7 @@ NODECOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX
240251
cname="Weighted normalized False Negatives relative to Filtered Scene-Based Occurrences Graph",
241252
folder=MEAS_FALSENEG,
242253
object="nodes",
254+
weighted=TRUE,
243255
foo=function(graph)
244256
{ tmp <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=TRUE)
245257
m <- matrix(0, nrow=gorder(graph), ncol=gorder(graph))
@@ -259,6 +271,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_DUR)]] <- list( #false
259271
cname="False Negatives relative to Scene-Based Duration Graph",
260272
folder=MEAS_FALSENEG,
261273
object="graph",
274+
weighted=FALSE,
262275
foo=function(graph)
263276
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_DUR), graph, filtered=FALSE)
264277
sum(values)
@@ -270,6 +283,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_WEIGHT, SFX_DUR)]] <- l
270283
cname="Weighted False Negatives relative to Scene-Based Duration Graph",
271284
folder=MEAS_FALSENEG,
272285
object="graph",
286+
weighted=TRUE,
273287
foo=function(graph)
274288
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
275289
sum(values)
@@ -281,6 +295,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_WEIGHT, SFX_NORM, SFX_D
281295
cname="Weighted normalized False Negatives relative to Scene-Based Duration Graph",
282296
folder=MEAS_FALSENEG,
283297
object="graph",
298+
weighted=TRUE,
284299
foo=function(graph)
285300
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
286301
sum(values)
@@ -292,6 +307,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_OCC)]] <- list( #false
292307
cname="False Negatives relative to Scene-Based Occurrences Graph",
293308
folder=MEAS_FALSENEG,
294309
object="graph",
310+
weighted=FALSE,
295311
foo=function(graph)
296312
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_OCC), graph, filtered=FALSE)
297313
sum(values)
@@ -303,6 +319,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_WEIGHT, SFX_OCC)]] <- l
303319
cname="Weighted False Negatives relative to Scene-Based Occurrences Graph",
304320
folder=MEAS_FALSENEG,
305321
object="graph",
322+
weighted=TRUE,
306323
foo=function(graph)
307324
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
308325
sum(values)
@@ -314,6 +331,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_TOTAL, SFX_WEIGHT, SFX_NORM, SFX_O
314331
cname="Weighted normalized False Negatives relative to Scene-Based Occurrences Graph",
315332
folder=MEAS_FALSENEG,
316333
object="graph",
334+
weighted=TRUE,
317335
foo=function(graph)
318336
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
319337
sum(values)
@@ -329,6 +347,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_DUR)]] <-
329347
cname="False Negatives relative to Filtered Scene-Based Duration Graph",
330348
folder=MEAS_FALSENEG,
331349
object="graph",
350+
weighted=FALSE,
332351
foo=function(graph)
333352
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_DUR), graph, filtered=TRUE)
334353
sum(values)
@@ -340,6 +359,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_WEIGHT, S
340359
cname="Weighted False Negatives relative to Filtered Scene-Based Duration Graph",
341360
folder=MEAS_FALSENEG,
342361
object="graph",
362+
weighted=TRUE,
343363
foo=function(graph)
344364
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_DUR), graph, filtered=TRUE)
345365
sum(values)
@@ -351,6 +371,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_WEIGHT, S
351371
cname="Weighted normalized False Negatives relative to Filtered Scene-Based Duration Graph",
352372
folder=MEAS_FALSENEG,
353373
object="graph",
374+
weighted=TRUE,
354375
foo=function(graph)
355376
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=TRUE)
356377
sum(values)
@@ -362,6 +383,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_OCC)]] <-
362383
cname="False Negatives relative to Filtered Scene-Based Occurrences Graph",
363384
folder=MEAS_FALSENEG,
364385
object="graph",
386+
weighted=FALSE,
365387
foo=function(graph)
366388
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_OCC), graph, filtered=TRUE)
367389
sum(values)
@@ -373,6 +395,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_WEIGHT, S
373395
cname="Weighted False Negatives relative to Filtered Scene-Based Occurrences Graph",
374396
folder=MEAS_FALSENEG,
375397
object="graph",
398+
weighted=TRUE,
376399
foo=function(graph)
377400
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_OCC), graph, filtered=TRUE)
378401
sum(values)
@@ -384,6 +407,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_TOTAL, SFX_WEIGHT, S
384407
cname="Weighted normalized False Negatives relative to Filtered Scene-Based Occurrences Graph",
385408
folder=MEAS_FALSENEG,
386409
object="graph",
410+
weighted=TRUE,
387411
foo=function(graph)
388412
{ values <- compute.falsenegative(paste0(MEAS_FALSENEG, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=TRUE)
389413
sum(values)

0 commit comments

Comments
 (0)