projects
/
satune.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
db18e26
)
Add Encoder changes
author
bdemsky
<bdemsky@uci.edu>
Fri, 16 Jun 2017 06:18:33 +0000
(23:18 -0700)
committer
bdemsky
<bdemsky@uci.edu>
Fri, 16 Jun 2017 06:23:00 +0000
(23:23 -0700)
src/Encoders/elementencoder.h
patch
|
blob
|
history
src/Encoders/functionencoder.h
patch
|
blob
|
history
src/Makefile
patch
|
blob
|
history
src/classlist.h
patch
|
blob
|
history
src/config.h
patch
|
blob
|
history
diff --git
a/src/Encoders/elementencoder.h
b/src/Encoders/elementencoder.h
index 5c03adb58e70fa82e4be81a48440e99c12a0df40..d4f214fde0f5f0b56c7c033114f93c97247c7984 100644
(file)
--- a/
src/Encoders/elementencoder.h
+++ b/
src/Encoders/elementencoder.h
@@
-3,7
+3,7
@@
#include "classlist.h"
enum ElementEncoderType {
#include "classlist.h"
enum ElementEncoderType {
- ONEHOT, UNARY, BINARY
, ONEHOTBINARY
+ ONEHOT, UNARY, BINARY
INDEX, ONEHOTBINARY, BINARYVAL
};
typedef enum ElementEncoderType ElementEncoderType;
};
typedef enum ElementEncoderType ElementEncoderType;
diff --git
a/src/Encoders/functionencoder.h
b/src/Encoders/functionencoder.h
index 3473d956612f13f7c036aff00682d6e93e0c6c15..6827535c90544503266886429d1dfa23422c7374 100644
(file)
--- a/
src/Encoders/functionencoder.h
+++ b/
src/Encoders/functionencoder.h
@@
-3,7
+3,7
@@
#include "classlist.h"
enum FunctionEncoderType {
#include "classlist.h"
enum FunctionEncoderType {
- ENUMERATEIMPLICATIONS
+ ENUMERATEIMPLICATIONS
, CIRCUIT
};
typedef enum FunctionEncoderType FunctionEncoderType;
};
typedef enum FunctionEncoderType FunctionEncoderType;
diff --git
a/src/Makefile
b/src/Makefile
index 311e361d9f28f94ac0350ee74f8738394ff2afbc..cbf758b4a2abf7914ba8ad7444732e7f7cc56ed0 100644
(file)
--- a/
src/Makefile
+++ b/
src/Makefile
@@
-55,7
+55,7
@@
clean:
PHONY += mrclean
mrclean: clean
PHONY += mrclean
mrclean: clean
- rm -rf docs
+ rm -rf
../
docs
PHONY += tags
tags:
PHONY += tags
tags:
@@
-69,7
+69,3
@@
wc:
wc */*.c */*.h *.c *.h
.PHONY: $(PHONY)
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 ac07af9e8066824cd5f866fb3db864a19efaffe1..8b412eab0f93c2c11d55d029a75f3d3e103d2f7e 100644
(file)
--- a/
src/classlist.h
+++ b/
src/classlist.h
@@
-9,7
+9,7
@@
#ifndef CLASSLIST_H
#define CLASSLIST_H
#ifndef CLASSLIST_H
#define CLASSLIST_H
-//#include "hashset.h"
+
#include "mymemory.h"
#include <inttypes.h>
#define bool int
#include "mymemory.h"
#include <inttypes.h>
#define bool int
diff --git
a/src/config.h
b/src/config.h
index b97f7da287e1ab0a963b39ef1cb571be87d1f6bb..b83cc1f87d34f97a90fed8d5637a2cbaf219af8d 100644
(file)
--- a/
src/config.h
+++ b/
src/config.h
@@
-23,6
+23,4
@@
//#define CONFIG_ASSERT
#endif
//#define CONFIG_ASSERT
#endif
-//#define VERBOSE_CONSTRAINTS
-
#endif
#endif