Merge branch 'master' of https://gitlab.com/AluminumTank/radec
This commit is contained in:
commit
6c40ee863f
@ -22,6 +22,11 @@ Wire * Event::getOutput() const
|
|||||||
return out;
|
return out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Event::setNum(int num)
|
||||||
|
{
|
||||||
|
evNum = num;
|
||||||
|
}
|
||||||
|
|
||||||
bool operator<(const Event &e1, const Event &e2) {
|
bool operator<(const Event &e1, const Event &e2) {
|
||||||
if(e1.evTime == e2.evTime) {
|
if(e1.evTime == e2.evTime) {
|
||||||
return e1.evNum > e2.evNum;
|
return e1.evNum > e2.evNum;
|
||||||
|
@ -12,6 +12,7 @@ class Event {
|
|||||||
int getValue() const;
|
int getValue() const;
|
||||||
int getTime() const;
|
int getTime() const;
|
||||||
Wire* getOutput() const;
|
Wire* getOutput() const;
|
||||||
|
void setNum(int num);
|
||||||
private:
|
private:
|
||||||
int evNum, evValue, evTime;
|
int evNum, evValue, evTime;
|
||||||
Wire *out;
|
Wire *out;
|
||||||
|
Loading…
Reference in New Issue
Block a user