Commit ec505d95 authored by Alexander David Hellwig's avatar Alexander David Hellwig

Merge branch 'master' into BoolValueExpression

parents b52ec932 1e16a116
......@@ -41,7 +41,7 @@
<se-commons.version>1.7.7</se-commons.version>
<mc.grammars.assembly.version>0.0.6-SNAPSHOT</mc.grammars.assembly.version>
<SIUnit.version>0.0.10-SNAPSHOT</SIUnit.version>
<Common-MontiCar.version>0.0.10-SNAPSHOT</Common-MontiCar.version>
<Common-MontiCar.version>0.0.11-SNAPSHOT</Common-MontiCar.version>
<Embedded-MontiArc.version>0.0.11-SNAPSHOT</Embedded-MontiArc.version>
<Embedded-MontiArc-Behaviour.version>0.0.11-SNAPSHOT</Embedded-MontiArc-Behaviour.version>
<Math.version>0.0.13-SNAPSHOT</Math.version>
......
......@@ -8,12 +8,12 @@ component Similarity<N1 n>{
implementation Math{
//calculate similarity matrix
for i=1:size(data,1)
/*for i=1:size(data,1)
for j=1:size(data,1)
Q dist = sqrt((data(i,1) - data(j,1))^2 + (data(i,2) - data(j,2))^2 + (data(i,3) - data(j,3))^2);
Q dist = sqrt((data(i,1) - data(j,1)) + (data(i,2) - data(j,2))^2 + (data(i,3) - data(j,3))^2);
similarity(i,j) = exp((0-dist)/(2*1^2));//sigma is replaced by one
end
end
end*/
//calculate degree matrix
for k=1:size(similarity,1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment