move results; write exp. results to subdirectories

Makefile

@@ -40,11 +40,12 @@ DATASETS := DS_1 DS_2
 query:
 	@$(foreach i, $(LIMIT), $(foreach c, $(CLS), $(foreach r, $(ROBUST), \
 	$(foreach attack, $(ATTACKS), $(foreach ds, $(DATASETS),  \
-	python3 -m src experiment $(ALWAYS) -a $(attack) $($(ds)) $($(r)) --iter $(i) -c $(c) ; )))))
+	python3 -m src experiment $(ALWAYS) --out output/query -a $(attack) $($(ds)) $($(r)) \
+	--iter $(i) -c $(c) ; )))))
 
 sample:
 	@$(foreach c, $(CLS), $(foreach r, $(ROBUST), $(foreach attack, $(ATTACKS), \
-	python3 -m src experiment $(ALWAYS) -a $(attack) $(DS_2) $($(r)) \
+	python3 -m src experiment $(ALWAYS) --out output/sample -a $(attack) $(DS_2) $($(r)) \
 	--iter 0 -s $(SAMPLE) -t $(TIMES) -c $(c) ; )))
 
 valid:
@@ -56,6 +57,9 @@ valid:
 plot:
 	@python3 -m src plot $(RESDIR)
 
+plot_result:
+	@python3 -m src plot output/query && python3 -m src plot output/sample
+
 stats:
 	@cd src && find . -name '*.py' | xargs wc -l && cd ..
 

readme.md

@@ -72,11 +72,11 @@ meaning attack's default limit is used.
 :eight_pointed_black_star: **Plot results** < 1 min
 
 ```
-make plot
+make plot_result
 ```
 
 Plot results of a previously performed experiment. The plot data source defaults to `output` directory. 
-To plot some other directory append `RESDIR` to the command, e.g. `make plot RESDIR=result/all`.
+To plot some other directory, use command: `make plot RESDIR=result/query` where `RESDIR` is path to some directory with experiment results.
 
 ## Run Custom Experiments
 

result/readme.md

@@ -2,5 +2,5 @@
 
 This directory contains results of experiments presented in the paper.
 
-- `query-limited` directory contains experiment results on different attack iterations. 
-- `sampled` directory contains experiment results on limited size, sampled input.  
+- `query` directory contains experiment results on different attack iterations. 
+- `sample` directory contains experiment results on limited size, sampled input.