First CommitHEADmaster

6 files changed, 48 insertions, 22 deletions

diff --git a/BlankConsoleLab/BlankConsoleLab.cpp b/BlankConsoleLab/BlankConsoleLab.cpp
deleted file mode 100644
index ed5f807..0000000
--- a/BlankConsoleLab/BlankConsoleLab.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// BlankConsoleLab.cpp : This file contains the 'main' function. Program execution begins and ends there.
-//
-
-#include <iostream>
-
-using namespace std;
-
-using std::cout;
-using std::cin;
-using std::endl;
-
-int main()
-{
-    cout << "Hello World!\n";
-}
-
diff --git a/BlankConsoleLab/BlankConsoleLab.vcxproj b/BlankConsoleLab/BlankConsoleLab.vcxproj
index db2e734..5cdea28 100644
--- a/BlankConsoleLab/BlankConsoleLab.vcxproj
+++ b/BlankConsoleLab/BlankConsoleLab.vcxproj
@@ -24,31 +24,32 @@
     <ProjectGuid>{3cecade6-3e15-4852-bd24-65bfe5d3a3aa}</ProjectGuid>
     <RootNamespace>BlankConsoleLab</RootNamespace>
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+    <ProjectName>CST116-Lab2-Chambers</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -139,7 +140,11 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="BlankConsoleLab.cpp" />
+    <ClCompile Include="CST116-Lab2-Chambers.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="CST116-Lab2-Psuedocode.txt" />
+    <Text Include="CST116-Lab2-Solution.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/BlankConsoleLab/BlankConsoleLab.vcxproj.filters b/BlankConsoleLab/BlankConsoleLab.vcxproj.filters
index aca1dd9..84e8fb0 100644
--- a/BlankConsoleLab/BlankConsoleLab.vcxproj.filters
+++ b/BlankConsoleLab/BlankConsoleLab.vcxproj.filters
@@ -15,8 +15,16 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="BlankConsoleLab.cpp">
+    <ClCompile Include="CST116-Lab2-Chambers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="CST116-Lab2-Psuedocode.txt">
+      <Filter>Source Files</Filter>
+    </Text>
+    <Text Include="CST116-Lab2-Solution.txt">
+      <Filter>Source Files</Filter>
+    </Text>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/BlankConsoleLab/CST116-Lab2-Chambers.cpp b/BlankConsoleLab/CST116-Lab2-Chambers.cpp
new file mode 100644
index 0000000..aed2e7e
--- /dev/null
+++ b/BlankConsoleLab/CST116-Lab2-Chambers.cpp
@@ -0,0 +1,29 @@
+
+#include <iostream>
+
+using namespace std;
+
+using std::cout;
+using std::cin;
+using std::endl;
+
+int main()
+{
+	float Giventemp, C, F, celsius, fahrenheit;
+
+	
+	cout << "Will your temperature be in celsius(C) or fahrenheit(F)?";
+	cin >> Giventemp;
+
+	if (Giventemp = C)
+	{
+		cout << "Please enter a temperature: ";
+		cin >> celsius;
+	}
+	if (Giventemp = F)
+	{
+		cout << "Please enter a temperature: ";
+		cin >> fahrenheit;
+	}
+}
+
diff --git a/BlankConsoleLab/CST116-Lab2-Psuedocode.txt b/BlankConsoleLab/CST116-Lab2-Psuedocode.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/BlankConsoleLab/CST116-Lab2-Psuedocode.txt
diff --git a/BlankConsoleLab/CST116-Lab2-Solution.txt b/BlankConsoleLab/CST116-Lab2-Solution.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/BlankConsoleLab/CST116-Lab2-Solution.txt