Remove wercker

Author: coenvl

README.md

@@ -4,7 +4,3 @@ mSAM
 mSAM is the matlab counterpart of jSAM. Scripts for creating problems and demonstrating the solvers.
 
 **Contact**: [coenvanl@gmail.com](mailto:coenvanl@gmail.com)
-
-__Build Status__
-
-[![wercker status](https://app.wercker.com/status/2ee92740ab543075323355361376b1ab/m/master "wercker status")](https://app.wercker.com/project/byKey/2ee92740ab543075323355361376b1ab)

anonymyze.sh

@@ -3,7 +3,7 @@
 options.plot.colors = cubehelix(8, .5, -1.5, 3, 1);
 options.export.do = true;
 options.export.format = 'eps';
-options.export.folder = 'C:\Data\Documents\PHD\papers\aaai17\images';
+options.export.folder = fullfile('data','aaai17','images');
 options.plot.errorbar = false;
 % options.plot.hi_error_fun = @(x) nanmean(x,2) + nanstd(x, [], 2);
 % options.plot.lo_error_fun = @(x) nanmean(x,2) - nanstd(x, [], 2);
@@ -15,7 +15,7 @@
 options.label.X = 'Running time (s)';
 
 %% Graph coloring experiment
-exp(1) = load('data\aaai17\results_graphColoring_delaunayGraph_i100_d3_n500_t20161118T175401.mat');
+exp(1) = load(fullfile('data','aaai17','results_graphColoring_delaunayGraph_i100_d3_n500_t20161118T175401.mat'));
 % exp(1).results = fixSleepyLaptop(exp(1).results);
 options.export.name = 'graph_coloring';
 

scripts/create_graphs.m

@@ -132,26 +132,26 @@
         solvername = sprintf('%s - %s', init{:}, iter{:});
         solverfield = matlab.lang.makeValidName(solvername);
 
-        plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
-                density = mean(results.(solverfield).density);
-                uniquevalexplored = mean([results.(solverfield).uniquevalexplored{:}]);
-                numvalexplored = mean([results.(solverfield).allvalexplored{:}]);
-                allcombos = (density/2) * settings.nagents * settings.nagents * (settings.ncolors + incoroporateUnsetComparison) * (settings.ncolors + incoroporateUnsetComparison);
-                supercombos = (settings.ncolors + incoroporateUnsetComparison) ^ settings.nagents;
-                fprintf('%s average values explored: %1.2f in %1.2f tries\n', ... %, (of %1.2f, so coverage %1.2f %%, precision %1.2f %%)\n', ...
-                    solvername, uniquevalexplored, numvalexplored); %, supercombos, 100 * uniquevalexplored / supercombos, 100 * uniquevalexplored / numvalexplored);
+        plot(mean(resultsMat.(solverfield).times, 2), mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
+%                 density = mean(results.(solverfield).density);
+%                 uniquevalexplored = mean([results.(solverfield).uniquevalexplored{:}]);
+%                 numvalexplored = mean([results.(solverfield).allvalexplored{:}]);
+%                 allcombos = (density/2) * settings.nagents * settings.nagents * (settings.ncolors + incoroporateUnsetComparison) * (settings.ncolors + incoroporateUnsetComparison);
+%                 supercombos = (settings.ncolors + incoroporateUnsetComparison) ^ settings.nagents;
+%                 fprintf('%s average values explored: %1.2f in %1.2f tries\n', ... %, (of %1.2f, so coverage %1.2f %%, precision %1.2f %%)\n', ...
+%                     solvername, uniquevalexplored, numvalexplored); %, supercombos, 100 * uniquevalexplored / supercombos, 100 * uniquevalexplored / numvalexplored);
     end
     fprintf('\n');
     h = legend(fieldnames(initSolver));
     set(h,'interpreter', 'none');
 
-    for init = fieldnames(initSolver)'
-        solvername = sprintf('%s - %s', init{:}, iter{:});
-        solverfield = matlab.lang.makeValidName(solvername);
-        plot(min(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
-        %         plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
-        plot(max(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
-    end
+%     for init = fieldnames(initSolver)'
+%         solvername = sprintf('%s - %s', init{:}, iter{:});
+%         solverfield = matlab.lang.makeValidName(solvername);
+%         plot(min(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
+%         %         plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
+%         plot(max(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
+%     end
 end
 
 % fprintf(

scripts/hybrid/experiment_hybridGCE.m

@@ -124,7 +124,7 @@
         solvername = sprintf('%s - %s', init{:}, iter{:});
         solverfield = matlab.lang.makeValidName(solvername);
 
-        plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
+        plot(mean(resultsMat.(solverfield).times, 2), mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
         %         density = mean(results.(solverfield).density);
         %         uniquevalexplored = mean([results.(solverfield).uniquevalexplored{:}]);
         %         numvalexplored = mean([results.(solverfield).allvalexplored{:}]);

scripts/hybrid/experiment_manualgraph.m

@@ -114,7 +114,7 @@
         solvername = sprintf('%s - %s', init{:}, iter{:});
         solverfield = matlab.lang.makeValidName(solvername);
 
-        plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
+        plot(mean(resultsMat.(solverfield).times, 2), mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
         %         density = mean(results.(solverfield).density);
         %         uniquevalexplored = mean([results.(solverfield).uniquevalexplored{:}]);
         %         numvalexplored = mean([results.(solverfield).allvalexplored{:}]);
@@ -130,9 +130,9 @@
     for init = fieldnames(initSolver)'
         solvername = sprintf('%s - %s', init{:}, iter{:});
         solverfield = matlab.lang.makeValidName(solvername);
-        plot(min(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
+        plot(mean(resultsMat.(solverfield).times, 2), min(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
         %         plot(mean(resultsMat.(solverfield).costs, 2), 'LineWidth', 3);
-        plot(max(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
+        plot(mean(resultsMat.(solverfield).times, 2), max(resultsMat.(solverfield).costs, [], 2), 'LineWidth', 1);
     end
 end