Skip to content

Eigen3 + fix #1

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

Open
beniz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Eigen3 + fix #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0edaa91
moving to eigen3 + adding debug symbol
beniz Oct 1, 2014
14e6ca7
fixed crash when reading empty line in dataset
beniz Oct 1, 2014
555e1f7
fixed makefile + activated openmp
beniz Oct 1, 2014
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
CXX = g++
CXXFLAGS = -O2 -Wall -I/usr/include/eigen2
CXXFLAGS = -O4 -Wall -I/usr/include/eigen3 -g -fopenmp
LDFLAGS =
OBJ = nca.o

nca: $(OBJ)
$(CXX) -o $@ $^ $(CXX_FLAGS) $(LDFLAGS)
$(CXX) -o $@ $^ $(CXXFLAGS) $(LDFLAGS)

clean:
rm -f $(OBJ) nca
32 changes: 16 additions & 16 deletions nca.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,22 @@ int main(int argc, char *argv[]) {

int size = -1;
while(std::getline(csv_file, s)) {
if(size < 0) size = csv_size(s);

CsvSplitter tok(s);
Eigen::VectorXd x(size);
int i = 0, pos = 0;
for(CsvSplitter::const_iterator t = tok.begin(); t != tok.end(); ++t) {
if(pos == label_index) {
label.push_back(*t);
} else {
x[i] = std::atof(t->c_str());
++i;
}
++pos;
}

input.push_back(x);
if(size < 0) size = csv_size(s);
if (s.empty())
continue;
CsvSplitter tok(s);
Eigen::VectorXd x(size);
int i = 0, pos = 0;
for(CsvSplitter::const_iterator t = tok.begin(); t != tok.end(); ++t) {
if(pos == label_index) {
label.push_back(*t);
} else {
x[i] = std::atof(t->c_str());
++i;
}
++pos;
}
input.push_back(x);
}

// Test
Expand Down