aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNataliia Brown <[email protected]>2024-02-15 23:18:29 -0800
committerNataliia Brown <[email protected]>2024-02-15 23:18:29 -0800
commitfdf5637254d90096c0f4282d2ea84ba57c0c6b89 (patch)
tree00c89446aa1a196d7514834527a28335c1df98d7
parentnew files added (diff)
downloadin-class-exercise-12-natabrown-fdf5637254d90096c0f4282d2ea84ba57c0c6b89.tar.xz
in-class-exercise-12-natabrown-fdf5637254d90096c0f4282d2ea84ba57c0c6b89.zip
compiles and correctHEADmain
-rw-r--r--In class 12/In class 12/In class 12.vcxproj3
-rw-r--r--In class 12/In class 12/In class 12.vcxproj.filters5
-rw-r--r--In class 12/In class 12/c_array.cpp39
-rw-r--r--In class 12/In class 12/c_array.h9
-rw-r--r--In class 12/In class 12/main.cpp8
5 files changed, 60 insertions, 4 deletions
diff --git a/In class 12/In class 12/In class 12.vcxproj b/In class 12/In class 12/In class 12.vcxproj
index 6b9d1e5..029eca6 100644
--- a/In class 12/In class 12/In class 12.vcxproj
+++ b/In class 12/In class 12/In class 12.vcxproj
@@ -130,6 +130,9 @@
<ClCompile Include="c_array.cpp" />
<ClCompile Include="main.cpp" />
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="c_array.h" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
diff --git a/In class 12/In class 12/In class 12.vcxproj.filters b/In class 12/In class 12/In class 12.vcxproj.filters
index 84ff304..44e6751 100644
--- a/In class 12/In class 12/In class 12.vcxproj.filters
+++ b/In class 12/In class 12/In class 12.vcxproj.filters
@@ -22,4 +22,9 @@
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="c_array.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/In class 12/In class 12/c_array.cpp b/In class 12/In class 12/c_array.cpp
index 30ac499..abdb141 100644
--- a/In class 12/In class 12/c_array.cpp
+++ b/In class 12/In class 12/c_array.cpp
@@ -4,12 +4,45 @@
// Assignment: In-Class Exercise 12
#include <iostream>
-
+#include "c_array.h"
using std::cout;
using std::cin;
using std::endl;
-int main() {
+void DoubleArraySize(int*& array, size_t& size) {
+ int* newArray = nullptr;
+
+ newArray = new int[size * 2];
+ for (auto i = 0u; i < size; ++i) {
+ newArray[i] = array[i];
+ }
+ delete[] array;
+
+ array = newArray;
+ size *= 2;
+ size += 1;
+ for (int i = 0; i < size; i++) {
+ array[i] = i;
+ }
+ for (int i = 102; i < size; i++) {
+ array[i] = 0;
+ }
+
+}
+
+
+//i.Doubles size of array and copies existing values
+//
+//ii.Sets new elements to 0
+
+void PrintArray(int* array, size_t size) {
+ for (int i = 0; i < size; i++) {
+ /*array[i] = i;*/
+ cout << "Array[" << i << "] = " << array[i] << endl;
+
+ }
+
+}
-} \ No newline at end of file
+//i.Prints the array \ No newline at end of file
diff --git a/In class 12/In class 12/c_array.h b/In class 12/In class 12/c_array.h
new file mode 100644
index 0000000..c56195f
--- /dev/null
+++ b/In class 12/In class 12/c_array.h
@@ -0,0 +1,9 @@
+#ifndef C_ARRAY_H
+#define C_ARRAY_H
+
+void DoubleArraySize(int*& array, size_t& size);
+
+void PrintArray(int* array, size_t size);
+
+
+#endif \ No newline at end of file
diff --git a/In class 12/In class 12/main.cpp b/In class 12/In class 12/main.cpp
index f732b56..71347e3 100644
--- a/In class 12/In class 12/main.cpp
+++ b/In class 12/In class 12/main.cpp
@@ -4,6 +4,7 @@
// Assignment: In-Class Exercise 12
#include <iostream>
+#include "c_array.h"
using std::cout;
@@ -11,5 +12,10 @@ using std::cin;
using std::endl;
int main() {
-
+ size_t size = 101;
+ int* array = new int[size];
+
+ DoubleArraySize(array, size);
+
+ PrintArray(array, size);
} \ No newline at end of file