cdez/CS249-Projects
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Makefile, Fixed Broken Inclusions, etc.

Browse source 
+- GeneralUtility.c
+- HashUtility.c
+- StateDataUtility.c
+- Makefile for PA10
This commit is contained in:
Charles Descamps 2023-11-13 11:55:58 -07:00
parent 798858cf4e
commit 6969f405e3
4 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PA10-1115/GeneralUtility.c
View file

@ -29,8 +29,8 @@ Dependencies: privateGetStringLength
int privateCompareStrings( const char *leftStr, const char *rightStr ) int privateCompareStrings( const char *leftStr, const char *rightStr )
{ {
int diff, index = 0; int diff, index = 0;
int leftStrLen = privateGetStringLen(leftStr); int leftStrLen = privateGetStringLength(leftStr);
int rightStrLen = privateGetStringLen(rightStr); int rightStrLen = privateGetStringLength(rightStr);
while (index < leftStrLen && index < rightStrLen) while (index < leftStrLen && index < rightStrLen)
{ {

6
PA10-1115/HashUtility.c
View file

@ -1,9 +1,11 @@
// header files // header files
#include "GeneralUtility.h"
#include "HashUtility.h" #include "HashUtility.h"
#include "StateDataUtility.h"
// constants // constants
/* /* Data Structures
typedef struct HashStruct typedef struct HashStruct
{ {
StateDataType *array; StateDataType *array;
@ -12,7 +14,7 @@ typedef struct HashStruct
ProbeType probeStrategy; ProbeType probeStrategy;
} ProbingHashType; } ProbingHashType;
*/ Data Structures */
// function definitions // function definitions

28
PA10-1115/Makefile
View file

@ -1,25 +1,25 @@
CC = gcc -Wall 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 SOURCES = PA10_Main.c GeneralUtility.c HashUtility.c StateDataUtility.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 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 # Uses the template structure defined in the TypicalUtils folder
all: PA09_Main all: PA10_Main
PA09_Main: $(OBJECTS) PA10_Main: $(OBJECTS)
$(CC) $(OBJECTS) -o PA09_Main $(CC) $(OBJECTS) -o PA10_Main
PA09_Main.o: PA09_Main.c PA10_Main.o: PA10_Main.c
$(CC) -c PA09_Main.c -o PA09_Main.o $(CC) -c PA10_Main.c -o PA10_Main.o
GeneralUtility.o: GeneralUtility.c GeneralUtility.o: GeneralUtility.c
$(CC) -c GeneralUtility.c -o GeneralUtility.o $(CC) -c GeneralUtility.c -o GeneralUtility.o
HeapUtility.o: HeapUtility.c HashUtility.o: HashUtility.c
$(CC) -c HeapUtility.c -o HeapUtility.o $(CC) -c HashUtility.c -o HashUtility.o
StudentUtility.o: StudentUtility.c StateDataUtility.o: StateDataUtility.c
$(CC) -c StudentUtility.c -o StudentUtility.o $(CC) -c StateDataUtility.c -o StateDataUtility.o
Console_IO_Utility.o: Console_IO_Utility.c Console_IO_Utility.o: Console_IO_Utility.c
$(CC) -c Console_IO_Utility.c -o Console_IO_Utility.o $(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 $(CC) -c File_Output_Utility.c -o File_Output_Utility.o
clean: clean:
rm -f $(OBJECTS) PA09_Main PA09_Main.out rm -f $(OBJECTS) PA10_Main PA10_Main.out
clean_objects: clean_objects:
rm -f $(OBJECTS) rm -f $(OBJECTS)
run: run:
./PA09_Main ./PA10_Main
run_win: run_win:
PA09_Main PA10_Main

14
PA10-1115/StateDataUtility.c
View file

@ -1,5 +1,7 @@
// header files // header files
#include "GeneralUtility.h"
#include "StateDataUtility.h" #include "StateDataUtility.h"
#include <stdio.h>
/* Data Structures /* Data Structures
typedef struct StateStruct typedef struct StateStruct
@ -30,6 +32,13 @@ Dependencies: privateCopyString
void setDataNodeFromData( StateDataType *nodePtr, const char *name, void setDataNodeFromData( StateDataType *nodePtr, const char *name,
double avgTemp, double lowTemp, double highTemp, bool nodeState ) 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. // no return, void.
} }
@ -48,6 +57,8 @@ Dependencies: setDataNodeFromData
void setDataNodeFromStruct( StateDataType *nodePtr, void setDataNodeFromStruct( StateDataType *nodePtr,
const StateDataType source ) const StateDataType source )
{ {
setDataNodeFromData(nodePtr, source.name, source.averageTemp,
source.lowestTemp, source.highestTemp, source.inUse);
// no return, void. // no return, void.
} }
@ -63,6 +74,9 @@ Dependencies: sprintf, or other options
*/ */
void stateDataToString( char *outStr, const StateDataType state ) 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. // no return, void.
} }