From 5ce8355d2ba35b8fdb686b8ecb9f6cfd66d36477 Mon Sep 17 00:00:00 2001
From: gereon <gereon.kremer@rwth-aachen.de>
Date: Sun, 2 Dec 2012 00:45:36 +0100
Subject: [PATCH] removing pantheios (new logger will be added soon) and fixed
a warning
---
src/parser/parser.cpp | 8 --------
src/parser/parser.h | 1 -
src/parser/readLabFile.cpp | 4 ----
src/parser/readTraFile.cpp | 20 +++-----------------
4 files changed, 3 insertions(+), 30 deletions(-)
diff --git a/src/parser/parser.cpp b/src/parser/parser.cpp
index fd075da59..8478e8832 100644
--- a/src/parser/parser.cpp
+++ b/src/parser/parser.cpp
@@ -10,7 +10,6 @@
#include <errno.h>
#include <iostream>
-#include <pantheios/pantheios.hpp>
#include "src/exceptions/file_IO_exception.h"
#include "src/exceptions/wrong_file_format.h"
@@ -56,14 +55,12 @@ mrmc::parser::MappedFile::MappedFile(const char* filename)
*/
if (stat64(filename, &(this->st)) != 0)
{
- pantheios::log_ERROR("Could not stat ", filename, ". Does it exist? Is it readable?");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in stat()");
}
this->file = open(filename, O_RDONLY);
if (this->file < 0)
{
- pantheios::log_ERROR("Could not open ", filename, ". Does it exist? Is it readable?");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in open()");
}
@@ -71,7 +68,6 @@ mrmc::parser::MappedFile::MappedFile(const char* filename)
if (this->data == (char*)-1)
{
close(this->file);
- pantheios::log_ERROR("Could not mmap ", filename, ".");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in mmap()");
}
this->dataend = this->data + this->st.st_size;
@@ -82,14 +78,12 @@ mrmc::parser::MappedFile::MappedFile(const char* filename)
*/
if (_stat64(filename, &(this->st)) != 0)
{
- pantheios::log_ERROR("Could not stat ", filename, ". Does it exist? Is it readable?");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in stat()");
}
this->file = CreateFileA(filename, GENERIC_READ, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (this->file == INVALID_HANDLE_VALUE)
{
- pantheios::log_ERROR("Could not open ", filename, ". Does it exist? Is it readable?");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in CreateFile()");
}
@@ -97,7 +91,6 @@ mrmc::parser::MappedFile::MappedFile(const char* filename)
if (this->mapping == NULL)
{
CloseHandle(this->file);
- pantheios::log_ERROR("Could not create file mapping for ", filename, ".");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in CreateFileMapping()");
}
@@ -106,7 +99,6 @@ mrmc::parser::MappedFile::MappedFile(const char* filename)
{
CloseHandle(this->mapping);
CloseHandle(this->file);
- pantheios::log_ERROR("Could not create file map view for ", filename, ".");
throw exceptions::file_IO_exception("mrmc::parser::MappedFile Error in MapViewOfFile()");
}
this->dataend = this->data + this->st.st_size;
diff --git a/src/parser/parser.h b/src/parser/parser.h
index d3777108c..949e9ee10 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -20,7 +20,6 @@
#include <errno.h>
#include <iostream>
-#include <pantheios/pantheios.hpp>
#include "src/exceptions/file_IO_exception.h"
#include "src/exceptions/wrong_file_format.h"
diff --git a/src/parser/readLabFile.cpp b/src/parser/readLabFile.cpp
index c9e6f2f12..246b9ca62 100644
--- a/src/parser/readLabFile.cpp
+++ b/src/parser/readLabFile.cpp
@@ -28,9 +28,6 @@
#include <fcntl.h>
#include <locale.h>
-#include <pantheios/pantheios.hpp>
-#include <pantheios/inserters/integer.hpp>
-
namespace mrmc {
namespace parser {
@@ -144,7 +141,6 @@ mrmc::models::AtomicPropositionsLabeling * readLabFile(uint_fast64_t node_count,
*/
uint_fast32_t node;
char proposition[128];
- char* tmp;
size_t cnt;
/*
* iterate over nodes
diff --git a/src/parser/readTraFile.cpp b/src/parser/readTraFile.cpp
index b288a0451..2c23ffc2f 100644
--- a/src/parser/readTraFile.cpp
+++ b/src/parser/readTraFile.cpp
@@ -26,10 +26,6 @@
#include <fcntl.h>
#include <locale.h>
-#include <pantheios/pantheios.hpp>
-#include <pantheios/inserters/integer.hpp>
-#include <pantheios/inserters/real.hpp>
-
namespace mrmc {
namespace parser{
@@ -104,7 +100,7 @@ static uint_fast32_t makeFirstPass(char* buf, uint_fast32_t &maxnode)
* @return a pointer to the created sparse matrix.
*/
-sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
+mrmc::storage::SquareSparseMatrix<double> * readTraFile(const char * filename) {
/*
* enforce locale where decimal point is '.'
*/
@@ -131,7 +127,7 @@ sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
*
* from here on, we already know that the file header is correct
*/
- sparse::SquareSparseMatrix<double> *sp = NULL;
+ mrmc::storage::SquareSparseMatrix<double> *sp = NULL;
/*
* read file header, extract number of states
@@ -142,16 +138,12 @@ sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
buf += 12; // skip "TRANSITIONS "
checked_strtol(buf, &buf);
- pantheios::log_DEBUG("Creating matrix with ",
- pantheios::integer(maxnode + 1), " maxnodes and ",
- pantheios::integer(non_zero), " Non-Zero-Elements");
-
/*
* Creating matrix
* Memory for diagonal elements is automatically allocated, hence only the number of non-diagonal
* non-zero elements has to be specified (which is non_zero, computed by make_first_pass)
*/
- sp = new sparse::SquareSparseMatrix<double>(maxnode + 1);
+ sp = new mrmc::storage::SquareSparseMatrix<double>(maxnode + 1);
if (sp == NULL) throw std::bad_alloc();
sp->initialize(non_zero);
@@ -174,11 +166,6 @@ sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
* only values in (0, 1] are meaningful
*/
if ((val <= 0.0) || (val > 1.0)) throw mrmc::exceptions::wrong_file_format();
- pantheios::log_DEBUG("Write value ",
- pantheios::real(val),
- " to position ",
- pantheios::integer(row), " x ",
- pantheios::integer(col));
sp->addNextValue(row,col,val);
buf = skipWS(buf);
}
@@ -186,7 +173,6 @@ sparse::SquareSparseMatrix<double> * readTraFile(const char * filename) {
/*
* clean up
*/
- pantheios::log_DEBUG("Finalizing Matrix");
sp->finalize();
return sp;
}