From 449ddc6ae6b887cfea2847b82dcb4c51ca90f262 Mon Sep 17 00:00:00 2001
From: raffitz <raf.a.m.c.gon@gmail.com>
Date: Wed, 21 Jul 2021 11:12:10 +0100
Subject: [PATCH] Add compatibility between test and graph

---
 .gitignore  |  1 +
 Cargo.lock  |  2 +-
 Cargo.toml  |  2 +-
 src/main.rs | 13 ++++++-------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index ae0fd69..ecc1ed7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 */*.csv
 */*.txt
 */*.gv
+*.gv
diff --git a/Cargo.lock b/Cargo.lock
index 933b18e..83621c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -311,7 +311,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "voxelmap"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "clap",
  "lodepng",
diff --git a/Cargo.toml b/Cargo.toml
index b83d16d..9838fd1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "voxelmap"
-version = "0.3.2"
+version = "0.3.3"
 authors = ["raffitz <raf.a.m.c.gon@gmail.com>"]
 edition = "2018"
 description = "Converts mathematical descriptions of objects to voxel maps"
diff --git a/src/main.rs b/src/main.rs
index 7b51345..e89a6a6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -109,8 +109,7 @@ fn main() -> Result<(), error::Error> {
                 .long("graph")
                 .help("Output graph of internal state")
                 .takes_value(false)
-                .multiple(false)
-                .conflicts_with("test"),
+                .multiple(false),
         )
         .arg(
             Arg::with_name("test")
@@ -177,7 +176,7 @@ fn main() -> Result<(), error::Error> {
     let test = matches.is_present("test");
 
     let output_folder = if test {
-        ""
+        "."
     } else {
         matches.value_of("OUTPUT_DIR").unwrap()
     };
@@ -272,10 +271,6 @@ fn main() -> Result<(), error::Error> {
         println!("\n{:?}", tree);
     }
 
-    if test {
-        return Ok(());
-    }
-
     // Print graph
     if graph {
         let mut gv_file = fs::File::create(format! {"{}/state.gv",output_folder})?;
@@ -304,6 +299,10 @@ fn main() -> Result<(), error::Error> {
         writeln!(gv_file, "}}")?;
     }
 
+    if test {
+        return Ok(());
+    }
+
     let min_x: i64 = min_x.unwrap();
     let max_x: i64 = max_x.unwrap();
     let min_y: i64 = min_y.unwrap();