Minor bug fixes and optimizations

Author: StephenKing

code/evaluateSingleInstanceHierarchical.m

@@ -44,7 +44,7 @@
     end
 end
 
-mylimit=2e7/4;
+mylimit=3e5;
 
 if ~exist('singlePlacementInstance','var')
 
@@ -72,6 +72,7 @@
         % Returns all placements for numberOfControllers
         [avgLatencyN2C,maxLatencyN2C,controllerlessNodes,controllerImbalance,avgLatencyC2C,maxLatencyC2C]=calculateMetrics(distanceMatrix,nk(:,workingsubset),nodeWeights);
     else
+        evaluationResult=[];
         return
         % find largest computable numberOfControllers (fitting in RAM)
         for i=numberOfControllers:-1:1

code/plotPareto.m

@@ -104,6 +104,30 @@
 xlims=get(gca,'xlim');
 ylims=get(gca,'ylim');
 
+if xlims(2)>2*max(xinthin) || xlims(2)<max(xinthin)
+    xlims(2)=max(xinthin)*1.2;
+end
+
+if ylims(2)>2*max(yinthin) || ylims(2)<max(yinthin)
+    ylims(2)=max(yinthin)*1.2;
+end
+
+if xlims(1)<0
+    xlims(1)=0;
+end
+
+if ylims(1)<0
+    ylims(1)=0;
+end
+
+if xlims(1)>min(xinthin)
+    xlims(1)=min(xinthin)*0.9;
+end
+
+if ylims(1)>min(yinthin)
+    ylims(1)=min(yinthin)*0.9;
+end
+
 c=[0.9 0.9 0.9];
 plot(x,y,'o-','LineWidth',2,'MarkerSize',10,'Color',darken(c),'MarkerFaceColor',c);
 
@@ -124,9 +148,13 @@
 ylabel(p.Results.YLabel);
 if ~isempty(p.Results.XLim)
     xlim(p.Results.XLim);
+else
+    xlim(xlims)
 end
 if ~isempty(p.Results.YLim)
     ylim(p.Results.YLim);
+else
+    ylim(ylims)
 end
 
 if plotexport==1 % Export is activated, save as pdf file