.gitignore

@@ -1,3 +0,0 @@
-/bin
-/obj
-*.layout

histogram.cpp

@@ -1,42 +0,0 @@
-#include "histogram.h"
-
-using namespace std;
-
-void
-find_minmax(const vector<double>& numbers, double& min, double& max) {
-min = numbers[0];
-max = numbers[0];
-for (double x : numbers) {
-    if (x < min) {
-        min = x;
-    }
-    else if (x > max) {
-        max = x;
-    }
-}
-}
-
-vector<size_t>
-make_histogram(const vector<double>& numbers, size_t bin_count){
-
-double min, max;
-find_minmax(numbers, min, max);
-double bin_size = (max - min) / bin_count;
-vector<size_t> bins(bin_count);
-
-for (size_t i = 0; i < numbers.size(); i++) {
-    bool found = false;
-    for (size_t j = 0; (j < bin_count - 1) && !found; j++) {
-        auto lo = min + j * bin_size;
-        auto hi = min + (j + 1) * bin_size;
-        if ((lo <= numbers[i]) && (numbers[i] < hi)) {
-            bins[j]++;
-            found = true;
-        }
-    }
-        if (!found) {
-        bins[bin_count - 1]++;
-    }}
-
-    return bins;
-}

histogram.h

@@ -1,11 +0,0 @@
-#ifndef HISTOGRAM_H_INCLUDED
-#define HISTOGRAM_H_INCLUDED
-
-#include <vector>
-
-std::vector<size_t>
-make_histogram(const std::vector<double>& numbers, size_t bin_count);
-
-
-#endif // HISTOGRAM_H_INCLUDED
-

histogram_internal.h

@@ -1,9 +0,0 @@
-#ifndef HISTOGRAM_INTERNAL_H_INCLUDED
-#define HISTOGRAM_INTERNAL_H_INCLUDED
-
-#include <vector>
-
-void find_minmax(const std::vector<double>& numbers, double& min, double& max);
-
-#endif // HISTOGRAM_INTERNAL_H_INCLUDED
-

lab3.cbp

@@ -32,13 +32,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram.h" />
 		<Unit filename="main.cpp" />
-		<Unit filename="svg.cpp" />
-		<Unit filename="svg.h" />
-		<Unit filename="text.cpp" />
-		<Unit filename="text.h" />
 		<Extensions>
 			<lib_finder disable_auto="1" />
 		</Extensions>

lab3.depend

@@ -1,29 +0,0 @@
-# depslib dependency file v1.0
-1686359317 source:c:\users\kostello\desktop\lubs\lab03.2\main.cpp
-	<string>
-	"histogram.h"
-	"text.h"
-	"svg.h"
-
-1686342281 source:c:\users\kostello\desktop\lubs\lab03.2\histogram.cpp
-	"histogram.h"
-
-1686342254 c:\users\kostello\desktop\lubs\lab03.2\histogram.h
-	<vector>
-
-1686349618 source:c:\users\kostello\desktop\lubs\lab03.2\text.cpp
-	"text.h"
-	<math.h>
-
-1686343275 c:\users\kostello\desktop\lubs\lab03.2\text.h
-	<vector>
-	<iostream>
-
-1686357236 c:\users\kostello\desktop\lubs\lab03.2\svg.h
-	<iostream>
-	<vector>
-
-1686357236 source:c:\users\kostello\desktop\lubs\lab03.2\svg.cpp
-	"svg.h"
-	<math.h>
-

main.cpp

@@ -1,48 +1,9 @@
-
+#include <iostream>
-#include "histogram.h"
-#include "text.h"
-#include "svg.h"
-
 
 using namespace std;
 
-struct Input {
-    vector<double> numbers;
-    size_t bin_count{};
-    vector<string> colour;
-};
-
-Input
-input_data(){
-
-Input in;
-
-size_t number_count;
-cin >> number_count;
-
-in.numbers.resize(number_count);
-
-for (size_t i = 0; i < number_count; i++) {
-    cin >> in.numbers[i];
-        }
-
-cin >> in.bin_count;
-
-in.colour.resize(in.bin_count+1);
-
-for (size_t i = 0; i < in.bin_count; i++) {
-    cin >> in.colour[i];
-}
-    return in;
-}
-
-
-
 int main()
 {
-    auto in = input_data();
+    cout << "Hello world!" << endl;
-    auto bins = make_histogram(in.numbers, in.bin_count);
-    show_histogram_svg(bins, in.colour);
-
     return 0;
 }

svg.cpp

@@ -1,53 +0,0 @@
-#include "svg.h"
-#include <math.h>
-
-
-using namespace std;
-
-void
-svg_begin(double width, double height) {
-    cout << "<?xml version='1.0' encoding='UTF-8'?>\n";
-    cout << "<svg ";
-    cout << "width='" << width << "' ";
-    cout << "height='" << height << "' ";
-    cout << "viewBox='0 0 " << width << " " << height << "' ";
-    cout << "xmlns='http://www.w3.org/2000/svg'>\n";
-}
-
-void
-svg_end() {
-    cout << "</svg>\n";
-}
-
-void
-svg_text(double left, double baseline, string text) {
-     cout << "<text x='" << left << "' y='" << baseline << "'>" << text << "</text>";
-}
-
-void svg_rect(double x, double y, double width, double height, string stroke, string fill){
-cout << "<rect x='" << x << "' y='" << y << "' width='" << width * 3 << "' height='" << height << "' stroke='" << stroke << "' fill='" << fill << "' />";
-}
-
-
-void
-show_histogram_svg(const vector<size_t>& bins, const vector<string>& colour) {
-
-    const auto IMAGE_WIDTH = 400;
-    const auto IMAGE_HEIGHT = 300;
-    const auto TEXT_LEFT = 20;
-    const auto TEXT_BASELINE = 20;
-    const auto TEXT_WIDTH = 50;
-    const auto BIN_HEIGHT = 30;
-    const auto BLOCK_WIDTH = 10;
-
-    svg_begin(400, 300);
-    double top = 0;
-        for (size_t i=0; i< bins.size(); i++) {
-        const double bin_width = BLOCK_WIDTH * bins[i];
-        svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bins[i]));
-        svg_rect(TEXT_WIDTH, top, bin_width, BIN_HEIGHT, "red", colour[i]);
-        top += BIN_HEIGHT;
-    }
-    svg_end();
-}
-

svg.h

@@ -1,10 +0,0 @@
-#ifndef SVG_H_INCLUDED
-#define SVG_H_INCLUDED
-
-#include <iostream>
-#include <vector>
-#include <string>
-
-void show_histogram_svg(const std::vector<size_t>& bins, const std::vector<std::string>& colour);
-
-#endif // SVG_H_INCLUDED

text.cpp

@@ -1,29 +0,0 @@
-#include "text.h"
-
-#include <math.h>
-
-
-using namespace std;
-
-void show_histogram_text(vector <size_t> bins, size_t bin_count)
-{
-
-for (size_t i = 0; i < bin_count; i++)
-{
-if (bins[i] < 100)
-{
-cout<< " ";
-}
-if (bins[i] < 10)
-{
-cout<< " ";
-}
-cout<< bins[i]<<"|";
-for (size_t j = 0; j < bins[i]; j++)
-{
-cout<< "*";
-}
-cout<< "\n";
-}
-}
-

text.h

@@ -1,10 +0,0 @@
-#ifndef TEXT_H_INCLUDED
-#define TEXT_H_INCLUDED
-
-#include <vector>
-#include <iostream>
-
-void show_histogram_text(std::vector <size_t> bins, size_t bin_count);
-
-
-#endif // TEXT_H_INCLUDED

unittest.cbp

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="unittest" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/unittest" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-			<Target title="Release">
-				<Option output="bin/Release/unittest" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Release/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-O2" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Extensions>
-			<lib_finder disable_auto="1" />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

unittest.cpp

@@ -1,45 +0,0 @@
-#define DOCTEST_CONFIG_NO_MULTITHREADING
-#define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest.h"
-#include "histogram_internal.h"
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1, 2}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 2);
-}
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({}, min, max);
-    CHECK(min == 0);
-    CHECK(max == 0);
-}
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({1}, min, max);
-    CHECK(min == 1);
-    CHECK(max == 1);
-}
-
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({-1, 2}, min, max);
-    CHECK(min == -1);
-    CHECK(max == 2);
-}
-TEST_CASE("distinct positive numbers") {
-    double min = 0;
-    double max = 0;
-    find_minmax({2, 2, 2, 2}, min, max);
-    CHECK(min == 2);
-    CHECK(max == 2);
-}
-
-

unittest.depend

@@ -1,7 +0,0 @@
-# depslib dependency file v1.0
-1686342281 source:c:\users\kostello\desktop\lubs\lab03.2\histogram.cpp
-	"histogram.h"
-
-1686342254 c:\users\kostello\desktop\lubs\lab03.2\histogram.h
-	<vector>
-