Merge pull request #293 from fandango-fuzzer/dev

Dev
fandango-fuzzer · Jan 31, 2025 · c093c27 · c093c27
2 parents 1a29d7e + ad08eed
commit c093c27
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -83,8 +83,7 @@ To reproduce the evaluation results from ISLa, please refer to [their replicatio
 To reproduce the evaluation results from FANDANGO, please download a development copy of the repository from [the official GitHub Repository](https://github.com/fandango-fuzzer/fandango), execute: (from the root directory)
 
 ```bash
-cd src/evaluation/evaluation &&
-python run_evaluation.py
+python -m evaluation.vs_isla.run_evaluation
 ```
 
 This script will execute FANDANGO on 5 subjects (CSV, reST, ScriptSizeC, TAR and XML). Each subject will be run for an hour, followed up by a computation on each grammar coverage (This process can take a while). The results will be printed in the terminal. Our evaluation showcases FANDANGO's search-based approach as a viable alternative to symbolic solvers, offering the following advantages:

diff --git a/evaluation/vs_isla/csv_evaluation/csv_evaluation.py b/evaluation/vs_isla/csv_evaluation/csv_evaluation.py
@@ -29,7 +29,7 @@ def is_syntactically_valid_csv(csv_string):
 def evaluate_csv(
     seconds=60,
 ) -> Tuple[str, int, int, float, Tuple[float, int, int], float, float]:
-    file = open("csv_evaluation/csv.fan", "r")
+    file = open("evaluation/vs_isla/csv_evaluation/csv.fan", "r")
     grammar, constraints = parse(file, use_stdlib=False)
     solutions = []
 

diff --git a/evaluation/vs_isla/rest_evaluation/rest_evaluation.py b/evaluation/vs_isla/rest_evaluation/rest_evaluation.py
@@ -33,7 +33,7 @@ def is_syntactically_valid_rest(rst_string):
 def evaluate_rest(
     seconds=60,
 ) -> Tuple[str, int, int, float, Tuple[float, int, int], float, float]:
-    file = open("rest_evaluation/rest.fan", "r")
+    file = open("evaluation/vs_isla/rest_evaluation/rest.fan", "r")
     grammar, constraints = parse(file, use_stdlib=False)
     solutions = []
 

diff --git a/evaluation/vs_isla/scriptsizec_evaluation/scriptsizec_evaluation.py b/evaluation/vs_isla/scriptsizec_evaluation/scriptsizec_evaluation.py
@@ -84,7 +84,7 @@ def is_valid_tinyc_code(c_code: str) -> bool:
 def evaluate_scriptsizec(
     seconds=60,
 ) -> Tuple[str, int, int, float, Tuple[float, int, int], float, float]:
-    file = open("scriptsizec_evaluation/scriptsizec.fan", "r")
+    file = open("evaluation/vs_isla/scriptsizec_evaluation/scriptsizec.fan", "r")
     grammar, constraints = parse(file, use_stdlib=False)
     solutions = []
 

diff --git a/evaluation/vs_isla/tar_evaluation/tar_evaluation.py b/evaluation/vs_isla/tar_evaluation/tar_evaluation.py
@@ -25,7 +25,7 @@ def is_syntactically_valid_tar(tree: str):
 def evaluate_tar(
     seconds=60,
 ) -> Tuple[str, int, int, float, Tuple[float, int, int], float, float]:
-    file = open("tar_evaluation/tar.fan", "r")
+    file = open("evaluation/vs_isla/tar_evaluation/tar.fan", "r")
     grammar, constraints = parse(file, use_stdlib=False)
     solutions = []
 

diff --git a/evaluation/vs_isla/xml_evaluation/xml_evaluation.py b/evaluation/vs_isla/xml_evaluation/xml_evaluation.py
@@ -19,7 +19,7 @@ def is_syntactically_valid_xml(xml_string):
 def evaluate_xml(
     seconds=60,
 ) -> Tuple[str, int, int, float, Tuple[float, int, int], float, float]:
-    file = open("xml_evaluation/xml.fan", "r")
+    file = open("evaluation/vs_isla/xml_evaluation/xml.fan", "r")
     grammar, constraints = parse(file, use_stdlib=False)
     solutions = []
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -71,5 +71,5 @@ target-version = ['py311']
 [tool.poetry]
 packages = [
     { include = "fandango", from = "src" },
-    { include = "evaluation", from = "src" }
+    { include = "evaluation", from = "evaluation" }
 ]