aboutsummaryrefslogtreecommitdiff
path: root/Project1
diff options
context:
space:
mode:
authorConnor McDowell <[email protected]>2024-02-19 20:57:11 -0800
committerConnor McDowell <[email protected]>2024-02-19 20:57:11 -0800
commite2c04eb1111f0db1ee185bdc73cc7db51c3c9efc (patch)
treeaf8798f12cede1d156542fb6d253b1aa488edc4a /Project1
parenti hate this. with this combined with assignment 5 ive spent almost 30 hours o... (diff)
downloadhomework-6-connormcdowell275-e2c04eb1111f0db1ee185bdc73cc7db51c3c9efc.tar.xz
homework-6-connormcdowell275-e2c04eb1111f0db1ee185bdc73cc7db51c3c9efc.zip
still fuckin trying
Diffstat (limited to 'Project1')
-rw-r--r--Project1/Contacts.h2
-rw-r--r--Project1/contacts.cpp12
-rw-r--r--Project1/program.cpp5
3 files changed, 9 insertions, 10 deletions
diff --git a/Project1/Contacts.h b/Project1/Contacts.h
index 440f06a..d1cfe61 100644
--- a/Project1/Contacts.h
+++ b/Project1/Contacts.h
@@ -28,6 +28,6 @@ void update(contact newContact[], size_t MAX);
void printAll(contact newContact[], size_t MAX);
-contact contact_double(contact newContact[], size_t MAX, size_t t);
+void contact_double(contact*& newContact, size_t& MAX, size_t t);
#endif CONTACTS_HEADER_H \ No newline at end of file
diff --git a/Project1/contacts.cpp b/Project1/contacts.cpp
index b21f971..7db5b25 100644
--- a/Project1/contacts.cpp
+++ b/Project1/contacts.cpp
@@ -112,16 +112,16 @@ void printAll(contact newContact[], size_t MAX)
}
}
-contact contact_double(contact newContact[], size_t MAX, size_t t)
+void contact_double(contact*& newContact, size_t& MAX, size_t t)
{
contact* doubleContact = new contact[MAX * 2];
-
- for (newContact[t].count = t; t < MAX * 2; ++t)
+ size_t a = 0;
+ for (a = t, a < MAX * 2; ++a;)
{
- doubleContact[t] = newContact[t];
+ doubleContact[a] = newContact[a];
}
- MAX = MAX * 2;
delete[] newContact;
newContact = doubleContact;
- return newContact[MAX];
+ MAX = MAX * 2;
+ //return newContact[MAX];
} \ No newline at end of file
diff --git a/Project1/program.cpp b/Project1/program.cpp
index 639a7ac..5dd1654 100644
--- a/Project1/program.cpp
+++ b/Project1/program.cpp
@@ -48,10 +48,9 @@ int main()
delete[] newContact;
}
++t;
- if (t >= MAX - 1)
+ if (t >= MAX)
{
- *newContact = contact_double(&newContact[MAX], MAX, t);
- MAX = MAX * 2;
+ contact_double(newContact, MAX, t);
}
}
return 0;