diff --git a/benchmarks/dataframe_performance.cc b/benchmarks/dataframe_performance.cc index aa3a7e553..b63ad0372 100644 --- a/benchmarks/dataframe_performance.cc +++ b/benchmarks/dataframe_performance.cc @@ -39,19 +39,24 @@ typedef StdDataFrame MyDataFrame; int main(int, char *[]) { - std::cout << "Starting ... " << time(nullptr) << std::endl; + std::cout << "Starting ... " << std::endl; - MyDataFrame df; + const auto first = time(nullptr); auto index_vec = - MyDataFrame::gen_datetime_index("01/01/1970", "08/15/2019", time_frequency::secondly, 1); + MyDataFrame::gen_datetime_index("01/01/1970", "08/15/2019", + time_frequency::secondly, 1); const auto index_sz = index_vec.size(); + MyDataFrame df; df.load_data(std::move(index_vec), std::make_pair("normal", gen_normal_dist(index_sz)), std::make_pair("log_normal", gen_lognormal_dist(index_sz)), std::make_pair("exponential", gen_exponential_dist(index_sz))); - std::cout << "All memory allocations are done. Calculating means ... " << time(nullptr)<< std::endl; + const auto second = time(nullptr); + + std::cout << "All data loadings are done. Calculating means ... " + << second - first << std::endl; MeanVisitor n_mv; MeanVisitor ln_mv; @@ -64,7 +69,11 @@ int main(int, char *[]) { std::cout << fut1.get().get_result() << ", " << fut2.get().get_result() << ", " << fut3.get().get_result() << std::endl; - std::cout << time(nullptr) << " ... Done" << std::endl; + + const auto third = time(nullptr); + + std::cout << third - second << ", " << third - first + << " All done" << std::endl; return (0); } diff --git a/benchmarks/pandas_performance.py b/benchmarks/pandas_performance.py index 10f85f78b..98c5590c0 100644 --- a/benchmarks/pandas_performance.py +++ b/benchmarks/pandas_performance.py @@ -4,8 +4,9 @@ # ------------------------------------------------------------------------------ -print(f"Starting ... {int(time.time())}"); +print("Starting ..."); +first = time.time() timestamps = pd.date_range("1970-01-01", "2019-08-15", freq='S') df = pd.DataFrame({"timestamp": timestamps, "normal": np.random.normal(size=len(timestamps)), @@ -14,13 +15,17 @@ }) df.set_index("timestamp") -print(f"All memory allocations are done. Calculating means ... {int(time.time())}") +second = time.time() +print(f"All data loadings are done. Calculating means ... {int(second - first)}") m1: float = df["normal"].mean() m2: float = df["log_normal"].mean() m3: float = df["exponential"].mean() print(f"{m1}, {m2}, {m3}") -print(f"{int(time.time())} ... Done"); + +third = time.time() + +print(f"{int(third - second)}, {int(third - first)} All done"); # ------------------------------------------------------------------------------