From 63815adecc3c8cc7b11381a23c516c0c1e625545 Mon Sep 17 00:00:00 2001 From: ganome Date: Wed, 29 Jan 2025 18:58:36 -0700 Subject: [PATCH] code snippet using vectors from brodie's discord - time to learn vectors! --- lists/cpu.h | 29 +++++++++++++++++++++++++++-- lists/cpu.h.help | 19 +++++++++++++++++++ lists/cpulist | 5 +++++ lists/hardware.h | 2 +- main.cpp | 40 ++++++++++++---------------------------- 5 files changed, 64 insertions(+), 31 deletions(-) create mode 100644 lists/cpu.h.help create mode 100644 lists/cpulist diff --git a/lists/cpu.h b/lists/cpu.h index b130156..d419abd 100644 --- a/lists/cpu.h +++ b/lists/cpu.h @@ -1,10 +1,35 @@ #pragma once #include "hardware.h" +#include + using namespace std; +string line; +string& line2 = line; +void genCPUclasses() { + fstream cpuList; + cpuList.open("lists/cpulist", ios::in); + + if(cpuList.is_open()) { + cout << "File opened\n"; + } + else { cout << "Failed to open file!" << endl; } + + while (getline(cpuList, line)) { + // cout << line << endl; + line2 = line; + CPU *line = new CPU; + // BEGIN troubleshoot + line->HardwareSpecs["model"] = line2; + // cout << line->HardwareSpecs["model"] << endl; + cout << line2 << endl; + } -CPU *A7800x3d = new CPU; -CPU *Ii75820k = new CPU; + cpuList.close(); +}; + +// CPU *A7800x3d = new CPU; +// CPU *Ii75820k = new CPU; // std::string a7800x3d(std::string man){ diff --git a/lists/cpu.h.help b/lists/cpu.h.help new file mode 100644 index 0000000..412b564 --- /dev/null +++ b/lists/cpu.h.help @@ -0,0 +1,19 @@ +std::vector genCPUclasses() { + std::vector resultCpuList; + std::ifstream cpuList{"lists/cpulist", std::ifstream::in}; + + if(cpuList.is_open()) { + std::cout << "File opened\n"; + } + else { std::cout << "Failed to open file!\n"; } + + while (std::getline(cpuList, line)) { + CPU cpu; + cpu.HardwareSpecs["model"] = line; + resultCpuList.push_back(std::move(cpu)); + // cout << cpu.HardwareSpecs["model"] << '\n'; + cout << line << endl; + } + + return resultCpuList; +} diff --git a/lists/cpulist b/lists/cpulist new file mode 100644 index 0000000..f3d40fa --- /dev/null +++ b/lists/cpulist @@ -0,0 +1,5 @@ +A7800x3d +A7900x3d +A7900x +A7950x +Ii75820k diff --git a/lists/hardware.h b/lists/hardware.h index 4f9c50e..3bc2a1a 100644 --- a/lists/hardware.h +++ b/lists/hardware.h @@ -71,5 +71,5 @@ class CPU: public Hardware { class GPU: public Hardware { public: map GPUSpecs; - // GPUSpecs["Ram"] = GPU { "Ram", "12Gb" }; + // GPUSpecs["Ram"] = GPU { "Ram", "12Gb" }; }; diff --git a/main.cpp b/main.cpp index 5a0aa76..3e9bead 100644 --- a/main.cpp +++ b/main.cpp @@ -5,40 +5,24 @@ #include "include/setcpu.h" #include "include/sethardware.h" -void* ptr = &A7800x3d; - int main() { using namespace std; - -/* Error Checking - cout << "Main pointer address for A7800x3d: " << &A7800x3d << endl; - cout << "A7800x3d pointer before the value set is :" << &A7800x3d->manufacturer << endl; - cout << "A7800x3d value before change is: " << A7800x3d->manufacturer << endl; - A7800x3d->manufacturer = "AMD"; - cout << "A7800x3d manufacturer is: " << A7800x3d->manufacturer << endl; - cout << "A7800x3d pointer after the change to AMD is: " << &A7800x3d->manufacturer << endl; -*/ - // A7800x3d->manufacturer = "AMD"; - // Cat out both CPU's that have been created for sanity - // cout << "i75820k manufacturer is: " << Ii75820k->HardwareSpecs["manufacturer"] << endl; - // cout << "A7800x3d manufacturer is: " << A7800x3d->HardwareSpecs["manufacturer"] << endl; - - cout << "Lets try the setCPU function!\n"; - cout << "A7800x3d main clock speed is: " << A7800x3d->HardwareSpecs["mainclock"] << endl; - setHardwaremanufacturer(A7800x3d, "AMD"); - setCPUcores(A7800x3d, "cores", 8); - setCPUthreads(A7800x3d, "threads", 16); - setCPUmainclock(A7800x3d, "mainclock", "4.8 Ghz"); - setCPUboostclock(A7800x3d, "boostclock", "5.2 ghz"); - cout << "\n\nA7800x3d new main/boost speed is: " << A7800x3d->HardwareSpecs["mainclock"] << "/" << A7800x3d->HardwareSpecs["boostclock"] << endl; + genCPUclasses(); + + //Testing the new dictionaries + // cout << "Lets try the setCPU function!\n"; + // cout << "A7800x3d main clock speed is: " << line->HardwareSpecs["mainclock"] << endl; + // setHardwaremanufacturer(A7800x3d, "AMD"); + // setCPUcores(A7800x3d, "cores", 8); + // setCPUthreads(A7800x3d, "threads", 16); + // setCPUmainclock(A7800x3d, "mainclock", "4.8 Ghz"); + // setCPUboostclock(A7800x3d, "boostclock", "5.2 ghz"); + // cout << "\n\nA7800x3d new main/boost speed is: " << A7800x3d->HardwareSpecs["mainclock"] << "/" << A7800x3d->HardwareSpecs["boostclock"] << endl; // cout << "A7800x3d manufacturer is: " << A7800x3d->HardwareSpecs["manufacturer"] << "\n\n\n"; -// Start of Hardware Dictionary Test - // Hardwaredictadd(A7800x3d, "manufacturer", "Ganome Himself"); -// cout << "Parent Hardware() dict manufacturer is: " << A7800x3d->HardwareSpecs["manufacturer"]; - system("sleep 3s"); + system("sleep 1s"); return 0; }