Skip to content

Commit 3cd0fdc

Browse files
vlabatutvlabatut
committed
revising post scripts
1 parent be326e7 commit 3cd0fdc

File tree

17 files changed

+236
-235
lines changed

17 files changed

+236
-235
lines changed

‎src/measures/comparison/cosine.R‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_DUR)]] <- list( #Cosine similari
7070
bounds=c(0,1),
7171
cname="Cosine Similarity with Scene-Based Duration Graph",
7272
folder=MEAS_COSINE_SIM,
73-
object="graph",
73+
object="graph-comp",
7474
weighted=FALSE,
7575
foo=function(graph)
7676
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_DUR), graph, filtered=FALSE)
@@ -82,7 +82,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_DUR)]] <- list( #Wei
8282
bounds=c(0,1),
8383
cname="Weighted Cosine Similarity with Scene-Based Duration Graph",
8484
folder=MEAS_COSINE_SIM,
85-
object="graph",
85+
object="graph-comp",
8686
weighted=TRUE,
8787
foo=function(graph)
8888
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
@@ -94,7 +94,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_DUR)]] <-
9494
bounds=c(0,1),
9595
cname="Weighted normalized Cosine Similarity with Scene-Based Duration Graph",
9696
folder=MEAS_COSINE_SIM,
97-
object="graph",
97+
object="graph-comp",
9898
weighted=TRUE,
9999
foo=function(graph)
100100
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
@@ -106,7 +106,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_OCC)]] <- list( #Cosine similari
106106
bounds=c(0,1),
107107
cname="Cosine Similarity with Scene-Based Occurrences Graph",
108108
folder=MEAS_COSINE_SIM,
109-
object="graph",
109+
object="graph-comp",
110110
weighted=FALSE,
111111
foo=function(graph)
112112
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_OCC), graph, filtered=FALSE)
@@ -118,7 +118,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_OCC)]] <- list( #Wei
118118
bounds=c(0,1),
119119
cname="Weighted Cosine Similarity with Scene-Based Occurrences Graph",
120120
folder=MEAS_COSINE_SIM,
121-
object="graph",
121+
object="graph-comp",
122122
weighted=TRUE,
123123
foo=function(graph)
124124
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
@@ -130,7 +130,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_OCC)]] <-
130130
bounds=c(0,1),
131131
cname="Weighted normalized Cosine Similarity with Scene-Based Occurrences Graph",
132132
folder=MEAS_COSINE_SIM,
133-
object="graph",
133+
object="graph-comp",
134134
weighted=TRUE,
135135
foo=function(graph)
136136
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
@@ -146,7 +146,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_DUR)]] <- list( #C
146146
bounds=c(0,1),
147147
cname="Cosine Similarity with Filtered Scene-Based Duration Graph",
148148
folder=MEAS_COSINE_SIM,
149-
object="graph",
149+
object="graph-comp",
150150
weighted=FALSE,
151151
foo=function(graph)
152152
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_DUR), graph, filtered=TRUE)
@@ -158,7 +158,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_DUR)]]
158158
bounds=c(0,1),
159159
cname="Weighted Cosine Similarity with Filtered Scene-Based Duration Graph",
160160
folder=MEAS_COSINE_SIM,
161-
object="graph",
161+
object="graph-comp",
162162
weighted=TRUE,
163163
foo=function(graph)
164164
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_DUR), graph, filtered=TRUE)
@@ -170,7 +170,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM,
170170
bounds=c(0,1),
171171
cname="Weighted normalized Cosine Similarity with Filtered Scene-Based Duration Graph",
172172
folder=MEAS_COSINE_SIM,
173-
object="graph",
173+
object="graph-comp",
174174
weighted=TRUE,
175175
foo=function(graph)
176176
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=TRUE)
@@ -182,7 +182,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_OCC)]] <- list( #C
182182
bounds=c(0,1),
183183
cname="Cosine Similarity with Filtered Scene-Based Occurrences Graph",
184184
folder=MEAS_COSINE_SIM,
185-
object="graph",
185+
object="graph-comp",
186186
weighted=FALSE,
187187
foo=function(graph)
188188
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_OCC), graph, filtered=TRUE)
@@ -194,7 +194,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_OCC)]]
194194
bounds=c(0,1),
195195
cname="Weighted Cosine Similarity with Filtered Scene-Based Occurrences Graph",
196196
folder=MEAS_COSINE_SIM,
197-
object="graph",
197+
object="graph-comp",
198198
weighted=TRUE,
199199
foo=function(graph)
200200
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_OCC), graph, filtered=TRUE)
@@ -206,7 +206,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM,
206206
bounds=c(0,1),
207207
cname="Weighted normalized Cosine Similarity with Filtered Scene-Based Occurrences Graph",
208208
folder=MEAS_COSINE_SIM,
209-
object="graph",
209+
object="graph-comp",
210210
weighted=TRUE,
211211
foo=function(graph)
212212
{ values <- compute.cosine.similarity(paste0(MEAS_COSINE_SIM, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=TRUE)

‎src/measures/comparison/euclidean.R‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_DUR)]] <- list( #Euclidean d
7070
bounds=c(0,NA),
7171
cname="Euclidean Distance with Scene-Based Duration Graph",
7272
folder=MEAS_EUCLIDEAN_DIST,
73-
object="graph",
73+
object="graph-comp",
7474
weighted=FALSE,
7575
foo=function(graph)
7676
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_DUR), graph, filtered=FALSE)
@@ -82,7 +82,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_DUR)]] <- list(
8282
bounds=c(0,NA),
8383
cname="Weighted Euclidean Distance with Scene-Based Duration Graph",
8484
folder=MEAS_EUCLIDEAN_DIST,
85-
object="graph",
85+
object="graph-comp",
8686
weighted=TRUE,
8787
foo=function(graph)
8888
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_DUR), graph, filtered=FALSE)
@@ -94,7 +94,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_DUR)]]
9494
bounds=c(0,NA),
9595
cname="Weighted normalized Euclidean Distance with Scene-Based Duration Graph",
9696
folder=MEAS_EUCLIDEAN_DIST,
97-
object="graph",
97+
object="graph-comp",
9898
weighted=TRUE,
9999
foo=function(graph)
100100
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=FALSE)
@@ -106,7 +106,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_OCC)]] <- list( #Euclidean d
106106
bounds=c(0,NA),
107107
cname="Euclidean Distance with Scene-Based Occurrences Graph",
108108
folder=MEAS_EUCLIDEAN_DIST,
109-
object="graph",
109+
object="graph-comp",
110110
weighted=FALSE,
111111
foo=function(graph)
112112
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_OCC), graph, filtered=FALSE)
@@ -118,7 +118,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_OCC)]] <- list(
118118
bounds=c(0,NA),
119119
cname="Weighted Euclidean Distance with Scene-Based Occurrences Graph",
120120
folder=MEAS_EUCLIDEAN_DIST,
121-
object="graph",
121+
object="graph-comp",
122122
weighted=TRUE,
123123
foo=function(graph)
124124
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_OCC), graph, filtered=FALSE)
@@ -130,7 +130,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_OCC)]]
130130
bounds=c(0,NA),
131131
cname="Weighted normalized Euclidean Distance with Scene-Based Occurrences Graph",
132132
folder=MEAS_EUCLIDEAN_DIST,
133-
object="graph",
133+
object="graph-comp",
134134
weighted=TRUE,
135135
foo=function(graph)
136136
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=FALSE)
@@ -146,7 +146,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_DUR)]] <- list
146146
bounds=c(0,NA),
147147
cname="Euclidean Distance with Filtered Scene-Based Duration Graph",
148148
folder=MEAS_EUCLIDEAN_DIST,
149-
object="graph",
149+
object="graph-comp",
150150
foo=function(graph)
151151
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_DUR), graph, filtered=TRUE)
152152
return(values)
@@ -157,7 +157,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_DU
157157
bounds=c(0,NA),
158158
cname="Weighted Euclidean Distance with Filtered Scene-Based Duration Graph",
159159
folder=MEAS_EUCLIDEAN_DIST,
160-
object="graph",
160+
object="graph-comp",
161161
foo=function(graph)
162162
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_DUR), graph, filtered=TRUE)
163163
return(values)
@@ -168,7 +168,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_NO
168168
bounds=c(0,NA),
169169
cname="Weighted normalized Euclidean Distance with Filtered Scene-Based Duration Graph",
170170
folder=MEAS_EUCLIDEAN_DIST,
171-
object="graph",
171+
object="graph-comp",
172172
foo=function(graph)
173173
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_DUR), graph, filtered=TRUE)
174174
return(values)
@@ -179,7 +179,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_OCC)]] <- list
179179
bounds=c(0,NA),
180180
cname="Euclidean Distance with Filtered Scene-Based Occurrences Graph",
181181
folder=MEAS_EUCLIDEAN_DIST,
182-
object="graph",
182+
object="graph-comp",
183183
foo=function(graph)
184184
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_OCC), graph, filtered=TRUE)
185185
return(values)
@@ -190,7 +190,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_OC
190190
bounds=c(0,NA),
191191
cname="Weighted Euclidean Distance with Filtered Scene-Based Occurrences Graph",
192192
folder=MEAS_EUCLIDEAN_DIST,
193-
object="graph",
193+
object="graph-comp",
194194
foo=function(graph)
195195
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_OCC), graph, filtered=TRUE)
196196
return(values)
@@ -201,7 +201,7 @@ GRAPHCOMP_MEASURES[[paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_NO
201201
bounds=c(0,NA),
202202
cname="Weighted normalized Euclidean Distance with Filtered Scene-Based Occurrences Graph",
203203
folder=MEAS_EUCLIDEAN_DIST,
204-
object="graph",
204+
object="graph-comp",
205205
foo=function(graph)
206206
{ values <- compute.euclidean.distance(paste0(MEAS_EUCLIDEAN_DIST, SFX_FILTERED, SFX_WEIGHT, SFX_NORM, SFX_OCC), graph, filtered=TRUE)
207207
return(values)

0 commit comments

Comments
 (0)