diff --git a/PA10-1115/GeneralUtility.c b/PA10-1115/GeneralUtility.c index c56857e..e9739b5 100644 --- a/PA10-1115/GeneralUtility.c +++ b/PA10-1115/GeneralUtility.c @@ -29,8 +29,8 @@ Dependencies: privateGetStringLength int privateCompareStrings( const char *leftStr, const char *rightStr ) { int diff, index = 0; - int leftStrLen = privateGetStringLen(leftStr); - int rightStrLen = privateGetStringLen(rightStr); + int leftStrLen = privateGetStringLength(leftStr); + int rightStrLen = privateGetStringLength(rightStr); while (index < leftStrLen && index < rightStrLen) { diff --git a/PA10-1115/HashUtility.c b/PA10-1115/HashUtility.c index aee2614..9718b22 100644 --- a/PA10-1115/HashUtility.c +++ b/PA10-1115/HashUtility.c @@ -1,9 +1,11 @@ // header files +#include "GeneralUtility.h" #include "HashUtility.h" +#include "StateDataUtility.h" // constants -/* +/* Data Structures typedef struct HashStruct { StateDataType *array; @@ -12,7 +14,7 @@ typedef struct HashStruct ProbeType probeStrategy; } ProbingHashType; -*/ +Data Structures */ // function definitions diff --git a/PA10-1115/Makefile b/PA10-1115/Makefile index d9b05e1..000a4aa 100644 --- a/PA10-1115/Makefile +++ b/PA10-1115/Makefile @@ -1,25 +1,25 @@ CC = gcc -Wall -SOURCES = PA09_Main.c GeneralUtility.c HeapUtility.c StudentUtility.c Console_IO_Utility.c File_Input_Utility.c File_Output_Utility.c -OBJECTS = PA09_Main.o GeneralUtility.o HeapUtility.o StudentUtility.o Console_IO_Utility.o File_Input_Utility.o File_Output_Utility.o +SOURCES = PA10_Main.c GeneralUtility.c HashUtility.c StateDataUtility.c Console_IO_Utility.c File_Input_Utility.c File_Output_Utility.c +OBJECTS = PA10_Main.o GeneralUtility.o HashUtility.o StateDataUtility.o Console_IO_Utility.o File_Input_Utility.o File_Output_Utility.o # Uses the template structure defined in the TypicalUtils folder -all: PA09_Main +all: PA10_Main -PA09_Main: $(OBJECTS) - $(CC) $(OBJECTS) -o PA09_Main +PA10_Main: $(OBJECTS) + $(CC) $(OBJECTS) -o PA10_Main -PA09_Main.o: PA09_Main.c - $(CC) -c PA09_Main.c -o PA09_Main.o +PA10_Main.o: PA10_Main.c + $(CC) -c PA10_Main.c -o PA10_Main.o GeneralUtility.o: GeneralUtility.c $(CC) -c GeneralUtility.c -o GeneralUtility.o -HeapUtility.o: HeapUtility.c - $(CC) -c HeapUtility.c -o HeapUtility.o +HashUtility.o: HashUtility.c + $(CC) -c HashUtility.c -o HashUtility.o -StudentUtility.o: StudentUtility.c - $(CC) -c StudentUtility.c -o StudentUtility.o +StateDataUtility.o: StateDataUtility.c + $(CC) -c StateDataUtility.c -o StateDataUtility.o Console_IO_Utility.o: Console_IO_Utility.c $(CC) -c Console_IO_Utility.c -o Console_IO_Utility.o @@ -31,13 +31,13 @@ File_Output_Utility.o: File_Output_Utility.c $(CC) -c File_Output_Utility.c -o File_Output_Utility.o clean: - rm -f $(OBJECTS) PA09_Main PA09_Main.out + rm -f $(OBJECTS) PA10_Main PA10_Main.out clean_objects: rm -f $(OBJECTS) run: - ./PA09_Main + ./PA10_Main run_win: - PA09_Main + PA10_Main diff --git a/PA10-1115/StateDataUtility.c b/PA10-1115/StateDataUtility.c index 5cf3041..eb8512d 100644 --- a/PA10-1115/StateDataUtility.c +++ b/PA10-1115/StateDataUtility.c @@ -1,5 +1,7 @@ // header files +#include "GeneralUtility.h" #include "StateDataUtility.h" +#include /* Data Structures typedef struct StateStruct @@ -30,6 +32,13 @@ Dependencies: privateCopyString void setDataNodeFromData( StateDataType *nodePtr, const char *name, double avgTemp, double lowTemp, double highTemp, bool nodeState ) { + // copy the string into the node + privateCopyString(nodePtr->name, name); + // copy the rest of the data into the node + nodePtr->averageTemp = avgTemp; + nodePtr->highestTemp = highTemp; + nodePtr->lowestTemp = lowTemp; + nodePtr->inUse = nodeState; // no return, void. } @@ -48,6 +57,8 @@ Dependencies: setDataNodeFromData void setDataNodeFromStruct( StateDataType *nodePtr, const StateDataType source ) { + setDataNodeFromData(nodePtr, source.name, source.averageTemp, + source.lowestTemp, source.highestTemp, source.inUse); // no return, void. } @@ -63,6 +74,9 @@ Dependencies: sprintf, or other options */ void stateDataToString( char *outStr, const StateDataType state ) { + // get the data out using sprintf + sprintf(outStr, "%s, Avg: %0.2f, Low: %0.2f, High: %0.2f,", state.name, + state.averageTemp, state.lowestTemp, state.highestTemp); // no return, void. }