Skip to content

Commit 3004e1b

Browse files
authored
Merge pull request #57 from intellistream/CodeReformat#56
#56 Former-commit-id: 9d09f03
2 parents 1d9a355 + e95a680 commit 3004e1b

8 files changed

Lines changed: 30 additions & 16 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ cmake_minimum_required(VERSION 3.14)
44
project(SESAME CXX)
55

66
# Judge the os system
7-
87
if (UNIX AND NOT APPLE)
98
add_definitions(-DUSELOG4CXX)
109
MESSAGE(STATUS "Enalbe Log4CXX")

‎include/Evaluation/Evaluation.hpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
#include <Algorithm/DataStructure/Point.hpp>
1010
#include <vector>
1111
namespace SESAME {
12+
13+
enum evaluateType { euclideanCost };
14+
1215
class Evaluation {
1316
public:
1417
static void euclideanCost(int numberOfPoints,

‎include/Sources/DataSource.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class DataSource {
3131
void load(int point_number, int dimension, vector <string> input);
3232
bool empty();
3333
PointPtr get();
34+
std::vector<PointPtr> getInputs();
3435
DataSource();
3536
~DataSource();
3637
void runningRoutine();

‎include/Utils/BenchmarkUtils.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include <Sources/DataSource.hpp>
2020
#include <Sinks/DataSink.hpp>
2121
#include <Algorithm/Algorithm.hpp>
22+
#include <Evaluation/Evaluation.hpp>
2223

2324
struct param_t {
2425
int pointNumber;
@@ -46,7 +47,7 @@ struct param_t {
4647
std::string inputPath;
4748
std::string outputPath;
4849
std::string algoName;
49-
50+
SESAME::evaluateType evaluateType;
5051
};
5152

5253
class BenchmarkUtils {

‎src/Evaluation/Evaluation.cpp‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// Copyright (C) 2021 by the IntelliStream team (https://github.com/intellistream)
22

3-
//
4-
// Created by Shuhao Zhang on 26/07/2021.
5-
//
63
#include <Evaluation/Evaluation.hpp>
74
#include <cmath>
85
#include <Utils/Logger.hpp>

‎src/Sources/DataSource.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,7 @@ void SESAME::DataSource::setBarrier(SESAME::BarrierPtr barrierPtr) {
8989
SESAME::DataSource::~DataSource() {
9090
stop();
9191
}
92+
vector<SESAME::PointPtr> SESAME::DataSource::getInputs() {
93+
return input;
94+
}
9295

‎src/Utils/BenchmarkUtils.cpp‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,17 @@ void BenchmarkUtils::defaultParam(param_t &cmd_params) {
140140
cmd_params.maxLeafNodes = 3;
141141
cmd_params.maxInternalNodes = 3;
142142
cmd_params.thresholdDistance = 6550;
143-
cmd_params.minPoints=10;
144-
cmd_params.epsilon=50;
145-
cmd_params.base=2;
146-
cmd_params.lambda=1.8;
147-
cmd_params.mu=7;
148-
cmd_params.beta=5;
143+
cmd_params.minPoints = 10;
144+
cmd_params.epsilon = 50;
145+
cmd_params.base = 2;
146+
cmd_params.lambda = 1.8;
147+
cmd_params.mu = 7;
148+
cmd_params.beta = 5;
149149
cmd_params.inputPath = std::filesystem::current_path().generic_string() + "/datasets/CoverType.txt";
150150
SESAME_INFO("Default Input Data Directory: " + cmd_params.inputPath);
151151
cmd_params.outputPath = "results.txt";
152152
cmd_params.algoName = "Birch";//StreamKMeans CluStream Birch
153+
cmd_params.evaluateType = SESAME::euclideanCost;
153154
}
154155

155156
/* command line handling functions */
@@ -200,8 +201,17 @@ void BenchmarkUtils::runBenchmark(param_t &cmd_params,
200201

201202
//Store results.
202203
algoPtr->store(cmd_params.outputPath, cmd_params.dimension, sinkPtr->getResults());
203-
SESAME_INFO("Finished store results: "<<sinkPtr->getResults().size());
204-
204+
SESAME_INFO("Finished store results: " << sinkPtr->getResults().size());
205+
206+
switch (cmd_params.evaluateType) {
207+
case SESAME::euclideanCost:
208+
SESAME::Evaluation::euclideanCost(cmd_params.pointNumber,
209+
sinkPtr->getResults().size(),
210+
cmd_params.dimension,
211+
sourcePtr->getInputs(),
212+
sinkPtr->getResults());
213+
break;
214+
}
205215
engine.stop();
206216
}
207217

‎test/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# adding the Google_Tests_run target
22
add_executable(Google_Tests_run
33
SystemTest/DenStreamTest.cpp
4-
#SystemTest/CluStreamTest.cpp
5-
# SystemTest/StreamKMTest.cpp
6-
#SystemTest/BirchTest.cpp
4+
SystemTest/CluStreamTest.cpp
5+
SystemTest/StreamKMTest.cpp
6+
SystemTest/BirchTest.cpp
77
)
88

99
# linking Google_Tests_run with sesame_lib which will be tested

0 commit comments

Comments
 (0)