From f19f7c0b2bfb0dca08ebf6c8f56a40de34769a58 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@kit.edu>
Date: Thu, 8 Oct 2020 14:53:48 +0200
Subject: [PATCH] Remove old files
---
VirtualRobot/CMakeLists.txt | 4 --
VirtualRobot/math/statistics/BoxPlot.h | 10 ---
VirtualRobot/math/statistics/Histogram.h | 14 -----
VirtualRobot/math/statistics/measures.cpp | 75 -----------------------
VirtualRobot/math/statistics/measures.h | 31 ----------
5 files changed, 134 deletions(-)
delete mode 100644 VirtualRobot/math/statistics/BoxPlot.h
delete mode 100644 VirtualRobot/math/statistics/Histogram.h
delete mode 100644 VirtualRobot/math/statistics/measures.cpp
delete mode 100644 VirtualRobot/math/statistics/measures.h
diff --git a/VirtualRobot/CMakeLists.txt b/VirtualRobot/CMakeLists.txt
index 738f6bd2a..dc87eff5f 100644
--- a/VirtualRobot/CMakeLists.txt
+++ b/VirtualRobot/CMakeLists.txt
@@ -270,7 +270,6 @@ SET(SOURCES
math/Primitive.cpp
math/Triangle.cpp
math/WeightedAverage.cpp
- math/statistics/measures.cpp
MJCF/Document.cpp
MJCF/elements/core/AnyElement.cpp
@@ -482,9 +481,6 @@ SET(INCLUDES
math/TransformedFunctionR2R3.h
math/Triangle.h
math/WeightedAverage.h
- math/statistics/measures.h
- math/statistics/BoxPlot.h
- math/statistics/Histogram.h
mjcf.h
MJCF/Document.h
diff --git a/VirtualRobot/math/statistics/BoxPlot.h b/VirtualRobot/math/statistics/BoxPlot.h
deleted file mode 100644
index 5c76ebe82..000000000
--- a/VirtualRobot/math/statistics/BoxPlot.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-
-#include <SimoxUtility/math/statistics/BoxPlotStats.h>
-
-
-namespace math { namespace stat
-{
- using BoxPlot = simox::math::BoxPlotStats;
-}}
-
diff --git a/VirtualRobot/math/statistics/Histogram.h b/VirtualRobot/math/statistics/Histogram.h
deleted file mode 100644
index 8a369ffd8..000000000
--- a/VirtualRobot/math/statistics/Histogram.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <SimoxUtility/math/statistics/Histogram.h>
-
-
-namespace VirtualRobot
-{
-
- namespace math { namespace stat
- {
- using Histogram = simox::math::Histogram;
- }}
-
-}
diff --git a/VirtualRobot/math/statistics/measures.cpp b/VirtualRobot/math/statistics/measures.cpp
deleted file mode 100644
index baaf92dcd..000000000
--- a/VirtualRobot/math/statistics/measures.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "measures.h"
-
-#include <SimoxUtility/math/statistics/measures.h>
-
-
-namespace math { namespace stat
-{
-
-void sort(std::vector<float>& values)
-{
- std::sort(values.begin(), values.end());
-}
-
-std::vector<float> sorted(const std::vector<float>& values)
-{
- return simox::math::sorted(values);
-}
-
-float min(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::min(values, isSorted);
-}
-
-float max(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::max(values, isSorted);
-}
-
-float mean(const std::vector<float>& values)
-{
- return simox::math::mean(values);
-}
-
-float stddev(const std::vector<float>& values)
-{
- return simox::math::stddev(values);
-}
-
-float stddev(const std::vector<float>& values, float mean)
-{
- return simox::math::stddev(values, mean);
-}
-
-float quantile(const std::vector<float>& values, float p, bool isSorted)
-{
- return simox::math::quantile(values, p, isSorted);
-}
-
-float lowerQuartile(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::lower_quartile(values, isSorted);
-}
-
-float median(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::median(values, isSorted);
-}
-
-float upperQuartile(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::upper_quartile(values, isSorted);
-}
-
-float interquartileRange(const std::vector<float>& values, bool isSorted)
-{
- return simox::math::interquartile_range(values, isSorted);
-}
-
-float interquartileRange(float lowerQuartile, float upperQuartile)
-{
- return simox::math::interquartile_range(lowerQuartile, upperQuartile);
-}
-
-
-}}
diff --git a/VirtualRobot/math/statistics/measures.h b/VirtualRobot/math/statistics/measures.h
deleted file mode 100644
index f1839e3c2..000000000
--- a/VirtualRobot/math/statistics/measures.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include <vector>
-
-
-namespace math { namespace stat
-{
-
- void sort(std::vector<float>& values);
- std::vector<float> sorted(const std::vector<float>& values);
-
-
- float min(const std::vector<float>& values, bool isSorted=false);
- float max(const std::vector<float>& values, bool isSorted=false);
- float mean(const std::vector<float>& values);
-
- float stddev(const std::vector<float>& values);
- float stddev(const std::vector<float>& values, float mean);
-
- float quantile(const std::vector<float>& values, float p, bool isSorted=false);
-
- float lowerQuartile(const std::vector<float>& values, bool isSorted=false);
- float median(const std::vector<float>& values, bool isSorted=false);
- float upperQuartile(const std::vector<float>& values, bool isSorted=false);
-
- float interquartileRange(const std::vector<float>& values, bool isSorted=false);
- float interquartileRange(float lowerQuartile, float upperQuartile);
-
-
-
-}}
--
GitLab