summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Simianer <p@simianer.de>2014-07-23 12:57:31 +0200
committerPatrick Simianer <p@simianer.de>2014-07-23 12:57:31 +0200
commit931401b65f5a06bdb1569c33044679694d35fe41 (patch)
tree57a30fb372336ecb29997aed22a34fcb3671527b
parent4b7b2693e829166ccec8707b59fb2bc26179551b (diff)
cosmetic
-rw-r--r--fast/Makefile2
-rw-r--r--fast/grammar.cc2
-rw-r--r--fast/grammar.hh2
-rw-r--r--fast/grammar.obin285176 -> 0 bytes
-rw-r--r--fast/test/Makefile13
5 files changed, 4 insertions, 15 deletions
diff --git a/fast/Makefile b/fast/Makefile
index b2b697f..6d05fea 100644
--- a/fast/Makefile
+++ b/fast/Makefile
@@ -5,6 +5,8 @@ CFLAGS=-std=c++11 -O3
all: hypergraph.o main.cc
$(COMPILER) $(CFLAGS) -std=c++11 -lstdc++ -lm -lmsgpack grammar.o hypergraph.o main.cc -o fast_weaver
+test: test_grammar test_sparse_vector
+
hypergraph.o: hypergraph.cc hypergraph.hh grammar.o semiring.hh
$(COMPILER) $(CFLAGS) -g -c hypergraph.cc
diff --git a/fast/grammar.cc b/fast/grammar.cc
index a8e2747..07d4732 100644
--- a/fast/grammar.cc
+++ b/fast/grammar.cc
@@ -158,5 +158,5 @@ operator<<(ostream& os, const Grammar& g)
return os;
}
-} // namespace
+} // namespace G
diff --git a/fast/grammar.hh b/fast/grammar.hh
index 3c7f208..76b96a6 100644
--- a/fast/grammar.hh
+++ b/fast/grammar.hh
@@ -73,5 +73,5 @@ struct Grammar {
friend ostream& operator<<(ostream& os, const Grammar& g);
};
-} // namespace
+} // namespace G
diff --git a/fast/grammar.o b/fast/grammar.o
deleted file mode 100644
index 984065c..0000000
--- a/fast/grammar.o
+++ /dev/null
Binary files differ
diff --git a/fast/test/Makefile b/fast/test/Makefile
deleted file mode 100644
index 3e01dc5..0000000
--- a/fast/test/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-COMPILER=clang
-CFLAGS=-std=c++11 -O3
-
-
-test_grammar: test_grammar.cc ../grammar.o
- $(COMPILER) $(CFLAGS) ../grammar.o test_grammar.cc
-
-test_sparse_vector: test_sparse_vector.cc
- $(COMPILER) $(CFLAGS) -lm test_sparse_vector.cc
-
-clean:
- rm -f test_grammar test_sparse_vector
-