lab34.cbp

@@ -32,22 +32,7 @@
 			<Add option="-Wall" />
 			<Add option="-fexceptions" />
 		</Compiler>
-		<Unit filename="histogram.cpp" />
-		<Unit filename="histogram.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="histogram_internal.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
 		<Unit filename="main.cpp" />
-		<Unit filename="svg.cpp" />
-		<Unit filename="svg.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
-		<Unit filename="text.cpp" />
-		<Unit filename="text.h">
-			<Option target="&lt;{~None~}&gt;" />
-		</Unit>
 		<Extensions />
 	</Project>
 </CodeBlocks_project_file>

main.cpp

@@ -3,7 +3,6 @@
 #include <math.h>
 #include "histogram.h"
 #include "text.h"
-#include "svg.h"
 
 
 using namespace std;
@@ -34,11 +33,15 @@ input_data()
     return in;
 }
 
+
+
+
+
 int main()
 {
-    auto in = input_data();
+    Input in = input_data();
     auto B = make_histogram(in.numbers, in.kol_kor);
-    show_histogram_svg(B);
+    show_histogram_text(B, in.kol_kor);
 
     return 0;
 }