Skip to content

Reformat all the files with a clang linter #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

Open
Nicola17 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Reformat all the files with a clang linter #8

Show file tree
Hide file tree
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
191 changes: 99 additions & 92 deletions applications/command_line_tools/atsne_cmd.cpp
View file
Open in desktop

Large diffs are not rendered by default.

212 changes: 110 additions & 102 deletions applications/command_line_tools/atsne_pva_cmd.cpp
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 11 additions & 13 deletions applications/command_line_tools/data_conversion/bin_2_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,42 @@
*
*/

#include <iostream>
#include <fstream>
#include <string>
#include <sstream>
#include <iostream>
#include <map>
#include <sstream>
#include <string>

#include "hdi/utils/cout_log.h"
#include "hdi/utils/log_helper_functions.h"

int main(int argc, char *argv[]){

int main(int argc, char *argv[]) {
hdi::utils::CoutLog log;

std::ofstream out_file(argv[1], std::ios::out|std::ios::binary);
std::ofstream out_file(argv[1], std::ios::out | std::ios::binary);
std::ifstream in_file(argv[2], std::ios::in);
std::string line;

std::map<unsigned int, unsigned int> stats;
unsigned int num_rows = 0;

while(std::getline(in_file,line)){
std::stringstream line_stream(line);
std::string cell;
while (std::getline(in_file, line)) {
std::stringstream line_stream(line);
std::string cell;

unsigned int num_cells = 0;
while(std::getline(line_stream,cell,',')){
while (std::getline(line_stream, cell, ',')) {
float v = std::atof(cell.c_str());
out_file.write((char*)(&v),sizeof(float));
out_file.write((char *)(&v), sizeof(float));
++num_cells;
}
++stats[num_cells];
++num_rows;
}

hdi::utils::secureLogValue(&log, "#rows", num_rows);
for(auto e: stats){
for (auto e : stats) {
hdi::utils::secureLogValue(&log, "\tcolumns", e.first);
hdi::utils::secureLogValue(&log, "\t#rows", e.second);
}

}
51 changes: 27 additions & 24 deletions applications/command_line_tools/data_conversion/cifar_2_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,41 @@
*
*/

#include <iostream>
#include <fstream>
#include <string>
#include <sstream>
#include <map>
#include <iomanip>
#include <iostream>
#include <map>
#include <sstream>
#include <string>

#include <stdint.h>
#include "hdi/utils/cout_log.h"
#include "hdi/utils/log_helper_functions.h"
#include "hdi/data/panel_data.h"
#include "hdi/utils/cout_log.h"
#include "hdi/utils/dataset_utils.h"
#include "hdi/utils/log_helper_functions.h"

int main(int argc, char *argv[]){
try{
int main(int argc, char* argv[]) {
try {
typedef double scalar_type;
hdi::utils::CoutLog log;

if(argc != 5){
hdi::utils::secureLog(&log,"Wrong number of input parameters...");
if (argc != 5) {
hdi::utils::secureLog(&log, "Wrong number of input parameters...");
return 1;
}
std::ofstream out_file(argv[1], std::ios::out);

if (!out_file.is_open()){
if (!out_file.is_open()) {
throw std::runtime_error("output file cannot be open");
}

hdi::data::PanelData<scalar_type> panel_data;
std::vector<unsigned int> labels;

hdi::utils::IO::loadCifar10(panel_data,labels,argv[2],argv[3],std::atoi(argv[4]));
hdi::utils::secureLogValue(&log,"test",panel_data.dataAt(3,3));
hdi::utils::IO::loadCifar10(panel_data, labels, argv[2], argv[3], std::atoi(argv[4]));
hdi::utils::secureLogValue(&log, "test", panel_data.dataAt(3, 3));
//hdi::data::unitNormalization(panel_data);
hdi::utils::secureLog(&log,"Data loaded...");
hdi::utils::secureLog(&log, "Data loaded...");

const unsigned int num_dp(panel_data.numDataPoints());
const unsigned int num_dims(panel_data.numDimensions());
Expand All @@ -73,25 +73,28 @@ int main(int argc, char *argv[]){
out_file << num_dp << std::endl;
out_file << num_dims << std::endl;

for(int i = 0; i < num_dims; ++i){
for (int i = 0; i < num_dims; ++i) {
out_file << "D" << i;
if(i!=(num_dims-1)){
if (i != (num_dims - 1)) {
out_file << ";";
}else{
} else {
out_file << std::endl;
}
}

for(int i = 0; i < num_dp; ++i){
for (int i = 0; i < num_dp; ++i) {
out_file << "P" << i << ";";
for(int d = 0; d < num_dims; ++d){
out_file << std::setprecision(5) << panel_data.dataAt(i,d) << ";";
for (int d = 0; d < num_dims; ++d) {
out_file << std::setprecision(5) << panel_data.dataAt(i, d) << ";";
}
out_file << int(labels[i]) << ".0" << std::endl;
out_file << int(labels[i]) << ".0" << std::endl;
}

} catch (std::logic_error& ex) {
std::cout << "Logic error: " << ex.what();
} catch (std::runtime_error& ex) {
std::cout << "Runtime error: " << ex.what();
} catch (...) {
std::cout << "An unknown error occurred";
}
catch(std::logic_error& ex){ std::cout << "Logic error: " << ex.what();}
catch(std::runtime_error& ex){ std::cout << "Runtime error: " << ex.what();}
catch(...){ std::cout << "An unknown error occurred";}
}
24 changes: 11 additions & 13 deletions applications/command_line_tools/data_conversion/csv_2_bin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,42 @@
*
*/

#include <iostream>
#include <fstream>
#include <string>
#include <sstream>
#include <iostream>
#include <map>
#include <sstream>
#include <string>

#include "hdi/utils/cout_log.h"
#include "hdi/utils/log_helper_functions.h"

int main(int argc, char *argv[]){

int main(int argc, char *argv[]) {
hdi::utils::CoutLog log;

std::ifstream in_file(argv[1], std::ios::in);
std::ofstream out_file(argv[2], std::ios::out|std::ios::binary);
std::ofstream out_file(argv[2], std::ios::out | std::ios::binary);
std::string line;

std::map<unsigned int, unsigned int> stats;
unsigned int num_rows = 0;

while(std::getline(in_file,line)){
std::stringstream line_stream(line);
std::string cell;
while (std::getline(in_file, line)) {
std::stringstream line_stream(line);
std::string cell;

unsigned int num_cells = 0;
while(std::getline(line_stream,cell,',')){
while (std::getline(line_stream, cell, ',')) {
float v = std::atof(cell.c_str());
out_file.write((char*)(&v),sizeof(float));
out_file.write((char *)(&v), sizeof(float));
++num_cells;
}
++stats[num_cells];
++num_rows;
}

hdi::utils::secureLogValue(&log, "#rows", num_rows);
for(auto e: stats){
for (auto e : stats) {
hdi::utils::secureLogValue(&log, "\tcolumns", e.first);
hdi::utils::secureLogValue(&log, "\t#rows", e.second);
}

}
Loading