3:created modules

vector.cpp

@@ -1,6 +1,8 @@
 #include <vector>
 #include <iostream>
 #include<cmath>
+#include "histogram.h"
+#include "text.h"
 const size_t SCREEN_WIDTH = 80;
 const size_t MAX_ASTERISK = SCREEN_WIDTH - 3 - 1;
 using namespace std;
@@ -27,73 +29,6 @@ Input input_data()
 	return in;
 }
 
-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);
-	vector<size_t> bins(bin_count);
-	double bin_size = (max - min) / 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 low = min + j * bin_size;
-			auto high = min + (j + 1) * bin_size;
-			if ((low <= numbers[i]) && (numbers[i] < high))
-			{
-				bins[j]++;
-				found = true;
-			}
-		}
-		if (!found)
-		{
-			bins[bin_count - 1]++;
-		}
-	}
-	return bins;
-}
-
-void show_histogram_text(vector<size_t> bins, size_t bin_count) {
-	double mxbins = bins[0];
-	for (double x : bins)
-	{
-		if (x > mxbins)
-			mxbins = x;
-	}
-	double k;
-	if (mxbins > MAX_ASTERISK)
-		k = MAX_ASTERISK / mxbins;
-	else
-		k = 1;
-	for (size_t i = 0; i < bin_count; i++)
-	{
-		if (bins[i] < 10) {
-			cout << "  ";
-		}
-		else if (bins[i] < 100) {
-			cout << " ";
-		}
-		cout << bins[i] << "|";
-		for (int j = 0; j < floor(bins[i] * k); j++)
-		{
-			cout << "*";
-		}
-
-		cout << endl;
-	}
-}
 
 int main()
 {

vector.vcxproj

@@ -127,8 +127,14 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="histogram.cpp" />
+    <ClCompile Include="text.cpp" />
     <ClCompile Include="vector.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="histogram.h" />
+    <ClInclude Include="text.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

vector.vcxproj.filters

@@ -18,5 +18,19 @@
     <ClCompile Include="vector.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
+    <ClCompile Include="histogram.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+    <ClCompile Include="text.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="histogram.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="text.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>