Skip to content

Revert "Change spurious use of malloc to new" #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2014
Merged

Revert "Change spurious use of malloc to new" #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions IntervalTree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <algorithm>
#include <iostream>

using namespace std;


template <class T, typename K = int>
class Interval {
Expand All @@ -30,7 +32,7 @@ int intervalStop(const Interval<T,K>& i) {
}

template <class T, typename K>
std::ostream& operator<<(std::ostream& out, Interval<T,K>& i) {
ostream& operator<<(ostream& out, Interval<T,K>& i) {
out << "Interval(" << i.start << ", " << i.stop << "): " << i.value;
return out;
}
Expand All @@ -48,9 +50,9 @@ class IntervalTree {

public:
typedef Interval<T,K> interval;
typedef std::vector<interval> intervalVector;
typedef vector<interval> intervalVector;
typedef IntervalTree<T,K> intervalTree;

intervalVector intervals;
intervalTree* left;
intervalTree* right;
Expand All @@ -66,7 +68,7 @@ class IntervalTree {
center = other.center;
intervals = other.intervals;
if (other.left) {
left = new intervalTree();
left = (intervalTree*) malloc(sizeof(intervalTree));
*left = *other.left;
} else {
left = NULL;
Expand Down Expand Up @@ -112,27 +114,27 @@ class IntervalTree {
--depth;
IntervalStartSorter<T,K> intervalStartSorter;
if (depth == 0 || (ivals.size() < minbucket && ivals.size() < maxbucket)) {
std::sort(ivals.begin(), ivals.end(), intervalStartSorter);
sort(ivals.begin(), ivals.end(), intervalStartSorter);
intervals = ivals;
} else {
if (leftextent == 0 && rightextent == 0) {
// sort intervals by start
std::sort(ivals.begin(), ivals.end(), intervalStartSorter);
sort(ivals.begin(), ivals.end(), intervalStartSorter);
}

int leftp = 0;
int rightp = 0;
int centerp = 0;

if (leftextent || rightextent) {
leftp = leftextent;
rightp = rightextent;
} else {
leftp = ivals.front().start;
std::vector<K> stops;
vector<K> stops;
stops.resize(ivals.size());
std::transform(ivals.begin(), ivals.end(), stops.begin(), intervalStop<T,K>);
rightp = *std::max_element(stops.begin(), stops.end());
transform(ivals.begin(), ivals.end(), stops.begin(), intervalStop<T,K>);
rightp = *max_element(stops.begin(), stops.end());
}

//centerp = ( leftp + rightp ) / 2;
Expand Down