undo an accidental merge in the wrong direction

NeuralNetworkVerification · Feb 5, 2019 · 56d2b2f · 56d2b2f
1 parent 5aa1b68
commit 56d2b2f
Show file tree

Hide file tree

Showing 66 changed files with 97 additions and 29,469 deletions.
diff --git a/ArtifactReadme.txt b/ArtifactReadme.txt
diff --git a/Makefile b/Makefile
@@ -5,7 +5,6 @@ SUBDIRS += \
 	src \
 
 all:
-	cp src/engine/marabou.elf bin/marabou.elf
 	@echo Done
 
 .PHONY: regress

diff --git a/bin/.gitignore b/bin/.gitignore
diff --git a/cpp_interface_example/Makefile b/cpp_interface_example/Makefile
diff --git a/cpp_interface_example/main.cpp b/cpp_interface_example/main.cpp
diff --git a/evaluation/nnet/ACASXU_run2a_1_1_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_1_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_2_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_2_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_3_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_3_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_4_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_4_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_5_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_5_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_6_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_6_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_7_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_7_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_8_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_8_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_1_9_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_1_9_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_1_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_1_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_2_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_2_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_3_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_3_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_4_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_4_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_5_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_5_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_6_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_6_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_7_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_7_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_8_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_8_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_2_9_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_2_9_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_1_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_1_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_2_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_2_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_3_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_3_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_4_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_4_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_5_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_5_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_6_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_6_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_7_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_7_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_8_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_8_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_3_9_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_3_9_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_1_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_1_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_2_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_2_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_3_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_3_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_4_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_4_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_5_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_5_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_6_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_6_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_7_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_7_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_8_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_8_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_4_9_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_4_9_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_1_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_1_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_2_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_2_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_3_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_3_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_4_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_4_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_5_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_5_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_6_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_6_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_7_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_7_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_8_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_8_batch_2000.nnet
diff --git a/evaluation/nnet/ACASXU_run2a_5_9_batch_2000.nnet b/evaluation/nnet/ACASXU_run2a_5_9_batch_2000.nnet
diff --git a/executable_example/acas.nnet b/executable_example/acas.nnet
diff --git a/executable_example/property.txt b/executable_example/property.txt
diff --git a/python_examples/generate_adversarial_example.py b/python_examples/generate_adversarial_example.py
diff --git a/python_examples/inputs/145.npy b/python_examples/inputs/145.npy
diff --git a/python_examples/inputs/374.npy b/python_examples/inputs/374.npy
diff --git a/python_examples/models/conv.pb b/python_examples/models/conv.pb
diff --git a/regress/GlobalConfiguration.cpp b/regress/GlobalConfiguration.cpp
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ SUBDIRS += \ @@
     	src \
     all:
-    	cp src/engine/marabou.elf bin/marabou.elf
     	@echo Done
     .PHONY: regress
@@ Expand Down @@