From 81117fb87ae3edb8b7bb31962f52b8c85af431fa Mon Sep 17 00:00:00 2001 From: Michael Abed Date: Sat, 7 Apr 2012 23:14:54 -0400 Subject: update --- computeTrussCost.m | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'computeTrussCost.m') diff --git a/computeTrussCost.m b/computeTrussCost.m index df7daad..e3fed5d 100755 --- a/computeTrussCost.m +++ b/computeTrussCost.m @@ -1,15 +1,5 @@ -function [ cost ] = computeTrussCost( C, X, Y ) +function [ cost ] = computeTrussCost( C, D ) cost = 0; - [ j, m ] = size(C); - cost = cost + 10*j; - for i = 1:m - memb = C(:,i); - points = [X(memb == 1); Y(memb == 1)]; - d = dist(points(:,1), points(:,2)); - cost = cost + d; - end + [ j, ~ ] = size(C); + cost = cost + 10*j + sum(D); end - -function [ d ] = dist(p1, p2) - d = sqrt((p1(1)-p2(1))^2+(p1(2)-p2(2))^2); -end \ No newline at end of file -- cgit v1.2.3