diff --git a/@miSim/updateAdjacency.m b/@miSim/updateAdjacency.m index b254f05..782e0da 100644 --- a/@miSim/updateAdjacency.m +++ b/@miSim/updateAdjacency.m @@ -24,22 +24,6 @@ function obj = updateAdjacency(obj) A(ii, jj) = false; end end - - - - % if norm(obj.agents{ii}.pos - obj.agents{jj}.pos) <= min([obj.agents{ii}.comRange, obj.agents{jj}.comRange]) - % % Make sure that obstacles don't obstruct the line - % % of sight, breaking the connection - % for kk = 1:size(obj.obstacles, 1) - % if A(ii, jj) && obj.obstacles{kk}.containsLine(obj.agents{ii}.pos, obj.agents{jj}.pos) - % A(ii, jj) = false; - % end - % end - % % need extra handling for cases with no obstacles - % if isempty(obj.obstacles) - % A(ii, jj) = true; - % end - % end end end diff --git a/geometries/@rectangularPrism/containsLine.m b/geometries/@rectangularPrism/containsLine.m index d5be933..6a161d4 100644 --- a/geometries/@rectangularPrism/containsLine.m +++ b/geometries/@rectangularPrism/containsLine.m @@ -43,32 +43,4 @@ function c = containsLine(obj, pos1, pos2) end end c = true; - - % if abs(d) < 1e-12 - % % check if it happens to start or end inside or outside of - % % the geometry - % if obj.contains(pos1) || obj.contains(pos2) - % c = true; - % else - % c = false; - % end - % return; - % end - % - % tMin = -inf; - % tMax = inf; - % - % % Standard case - % for ii = 1:3 - % t1 = (obj.minCorner(ii) - pos1(ii)) / d(ii); - % t2 = (obj.maxCorner(ii) - pos2(ii)) / d(ii); - % tMin = max(tMin, min(t1, t2)); - % tMax = min(tMax, max(t1, t2)); - % if tMin > tMax - % c = false; - % return; - % end - % end - % - % c = (tMax >= 0) && (tMin <= 1); end \ No newline at end of file