repositories
/
mc1516pa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
screen shrinking done
[mc1516pa.git]
/
modelchecker
/
main.c
diff --git
a/modelchecker/main.c
b/modelchecker/main.c
index
16dd229
..
d8d7e23
100644
(file)
--- a/
modelchecker/main.c
+++ b/
modelchecker/main.c
@@
-7,13
+7,15
@@
#include "mc.h"
#include "sokoban.h"
#include "mc.h"
#include "sokoban.h"
+#include "uthash.h"
//Global variables
bool DEBUG = false;
strategy strat = HYBRID;
//Global variables
bool DEBUG = false;
strategy strat = HYBRID;
-void usage(char *prg){
- fprintf(stderr,
+void usage(char *prg)
+{
+ fprintf(stderr,
"Usage:\n"
"\t%s [opts] [FILE [FILE [...]]]\n"
"\n"
"Usage:\n"
"\t%s [opts] [FILE [FILE [...]]]\n"
"\n"
@@
-33,13
+35,17
@@
void usage(char *prg){
"\t when no file is specified stdin will be used\n", prg);
}
"\t when no file is specified stdin will be used\n", prg);
}
-void solve(FILE *inputstream){
+void solve(FILE *inputstream)
+{
clock_t time_start_read, time_end_read;
clock_t time_start_encode, time_end_encode;
time_start_read = clock();
clock_t time_start_read, time_end_read;
clock_t time_start_encode, time_end_encode;
time_start_read = clock();
- //struct sokoban_screen *screen = parse_screen(inputstream);
- parse_screen(inputstream);
+ sokoban_screen *screen = parse_screen(inputstream);
+ if (screen == NULL) printf("Something went wrong...\n");
+ sokoban_print(screen);
+ sokoban_free(screen);
+ //parse_screen(inputstream);
time_end_read = clock();
time_start_encode = clock();
time_end_read = clock();
time_start_encode = clock();
@@
-58,7
+64,7
@@
void solve(FILE *inputstream){
exit(2);
}
time_end_encode = clock();
exit(2);
}
time_end_encode = clock();
-
+
// Future: SMC
fprintf(stderr, "Reading: %fs\n",
((double) (time_end_read-time_start_read))/CLOCKS_PER_SEC);
// Future: SMC
fprintf(stderr, "Reading: %fs\n",
((double) (time_end_read-time_start_read))/CLOCKS_PER_SEC);
@@
-66,7
+72,8
@@
void solve(FILE *inputstream){
((double) (time_end_encode-time_start_encode))/CLOCKS_PER_SEC);
}
((double) (time_end_encode-time_start_encode))/CLOCKS_PER_SEC);
}
-int main(int argc, char **argv){
+int main(int argc, char **argv)
+{
int optchar;
while((optchar = getopt(argc, argv, "cdhoy")) != -1){
int optchar;
while((optchar = getopt(argc, argv, "cdhoy")) != -1){