From 7601d07d77ec207b3984c2d31b69a60021c96dee Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky@uci.edu>
Date: Thu, 15 Jun 2017 23:18:33 -0700
Subject: [PATCH] Add Encoder changes
---
src/Encoders/elementencoder.h | 2 +-
src/Encoders/functionencoder.h | 2 +-
src/Makefile | 6 +-----
src/classlist.h | 2 +-
src/config.h | 2 --
5 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/src/Encoders/elementencoder.h b/src/Encoders/elementencoder.h
index 5c03adb..d4f214f 100644
--- a/src/Encoders/elementencoder.h
+++ b/src/Encoders/elementencoder.h
@@ -3,7 +3,7 @@
#include "classlist.h"
enum ElementEncoderType {
- ONEHOT, UNARY, BINARY, ONEHOTBINARY
+ ONEHOT, UNARY, BINARYINDEX, ONEHOTBINARY, BINARYVAL
};
typedef enum ElementEncoderType ElementEncoderType;
diff --git a/src/Encoders/functionencoder.h b/src/Encoders/functionencoder.h
index 3473d95..6827535 100644
--- a/src/Encoders/functionencoder.h
+++ b/src/Encoders/functionencoder.h
@@ -3,7 +3,7 @@
#include "classlist.h"
enum FunctionEncoderType {
- ENUMERATEIMPLICATIONS
+ ENUMERATEIMPLICATIONS, CIRCUIT
};
typedef enum FunctionEncoderType FunctionEncoderType;
diff --git a/src/Makefile b/src/Makefile
index 311e361..cbf758b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -55,7 +55,7 @@ clean:
PHONY += mrclean
mrclean: clean
- rm -rf docs
+ rm -rf ../docs
PHONY += tags
tags:
@@ -69,7 +69,3 @@ wc:
wc */*.c */*.h *.c *.h
.PHONY: $(PHONY)
-
-# A 1-inch margin PDF generated by 'pandoc'
-%.pdf: %.md
- pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'
diff --git a/src/classlist.h b/src/classlist.h
index ac07af9..8b412ea 100644
--- a/src/classlist.h
+++ b/src/classlist.h
@@ -9,7 +9,7 @@
#ifndef CLASSLIST_H
#define CLASSLIST_H
-//#include "hashset.h"
+
#include "mymemory.h"
#include <inttypes.h>
#define bool int
diff --git a/src/config.h b/src/config.h
index b97f7da..b83cc1f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -23,6 +23,4 @@
//#define CONFIG_ASSERT
#endif
-//#define VERBOSE_CONSTRAINTS
-
#endif
--
2.34.1