From 6741a85820096a6c7a8bc0efddf32f181747069e Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 10 Apr 2017 19:09:13 -0400 Subject: [PATCH] Fix the awfull code. --- src/event.cpp | 10 +++++----- src/event.h | 5 +++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/event.cpp b/src/event.cpp index d5a29a5..b2c71a7 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -2,12 +2,12 @@ using namespace std; -event::event(event, value, setTime, wire) : evNum(event), evValue(value), +event::event(int num, int value, int setTime, int wire) : evNum(num), evValue(value), evTime(setTime), wireNum(wire) {} -bool event::operator<(const event &e1, const event &e2) { - if(e1.evTime == e2.evTime) { - return e1.evNum > e2.evNum; +bool event::operator<(const event &e1) { + if(evTime == e1.evTime) { + return evNum > e1.evNum; } - return e1.evTime > e2.evTime; + return evTime > e1.evTime; } diff --git a/src/event.h b/src/event.h index f7822b0..27206fd 100644 --- a/src/event.h +++ b/src/event.h @@ -1,10 +1,11 @@ #ifndef EVENT #define EVENT + class event { public: - event(event, value, setTime, wire); - bool operator<(const event &e1, const event &e2); + event(int num, int value, int setTime, int wire); + bool operator<(const event &e1); private: int evNum, evValue, evTime, wireNum; };