Merge branch 'main' of https://github.com/vSutherland/javascript-projects

Author: vSutherland

more-on-functions/studio/part-one-find-minimum-value.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 function findMinValue(arr) {
     if (arr.length === 0) {
       return undefined; // Handle the case where the array is empty
@@ -8,6 +9,18 @@ function findMinValue(arr) {
     for (let i = 1; i < arr.length; i++) {
       if (arr[i] < minValue) {
         minValue = arr[i]; // Update minValue if a smaller element is found
+=======
+function findMinimumValue(arr) {
+    if (arr.length === 0) {
+      return undefined; // Handle the case of an empty array
+    }
+  
+    let minValue = arr[0]; // Initialize minValue with the first element of the array
+  
+    for (let i = 1; i < arr.length; i++) {
+      if (arr[i] < minValue) {
+        minValue = arr[i]; // Update minValue if a smaller value is found
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1
       }
     }
 
@@ -20,5 +33,11 @@ function findMinValue(arr) {
   let nums3 = [200, 5, 4, 10, 8, 5, -3.3, 4.4, 0];
 
   // Using one of the test arrays as the argument, call your function inside the console.log statement below.
+<<<<<<< HEAD
   console.log(findMinValue(nums1));
-  
+  
+=======
+  
+  console.log(findMinimumValue(nums1));
+  
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1

more-on-functions/studio/part-three-number-sorting-easy-way.js

@@ -1,7 +1,12 @@
+<<<<<<< HEAD
+=======
+// Sample arrays for testing:
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1
 let nums1 = [5, 10, 2, 42];
 let nums2 = [-2, 0, -10, -44, 5, 3, 0, 3];
 let nums3 = [200, 5, 4, 10, 8, 5, -3.3, 4.4, 0];
 
+<<<<<<< HEAD
 nums1.sort((a, b) => a - b);
 nums2.sort((a, b) => a - b);
 nums3.sort((a, b) => a - b); 
@@ -19,3 +24,25 @@ console.log("Sorted in descending order:");
 console.log(nums1);
 console.log(nums2);
 console.log(nums3);
+=======
+// Sort each array in ascending order
+nums1.sort((a, b) => a - b);
+nums2.sort((a, b) => a - b);
+nums3.sort((a, b) => a - b);
+
+console.log("Ascending Order:");
+console.log("nums1:", nums1);
+console.log("nums2:", nums2);
+console.log("nums3:", nums3);
+
+// Sort each array in descending order
+nums1.sort((a, b) => b - a);
+nums2.sort((a, b) => b - a);
+nums3.sort((a, b) => b - a);
+
+console.log("\nDescending Order:");
+console.log("nums1:", nums1);
+console.log("nums2:", nums2);
+console.log("nums3:", nums3);
+
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1

more-on-functions/studio/part-two-create-sorted-array.js

@@ -8,22 +8,37 @@ function findMinValue(arr) {
   return min;
 }
 
+<<<<<<< HEAD
 function sortArray(arr) {
   let sortedArray = [];
 
   while (arr.length > 0) {
     let minValue = findMinValue(arr);
+=======
+function sortArrayAscending(arr) {
+  const sortedArray = [];
+
+  while (arr.length > 0) {
+    const minValue = findMinValue(arr);
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1
     sortedArray.push(minValue);
     arr.splice(arr.indexOf(minValue), 1);
   }
 
   return sortedArray;
 }
 
+<<<<<<< HEAD
+=======
+// Sample arrays for testing:
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1
 let nums1 = [5, 10, 2, 42];
+
 let nums2 = [-2, 0, -10, -44, 5, 3, 0, 3];
+
 let nums3 = [200, 5, 4, 10, 8, 5, -3.3, 4.4, 0];
 
+<<<<<<< HEAD
 console.log("Sorted nums1:", sortArray(nums1));
 console.log("Sorted nums2:", sortArray(nums2));
 console.log("Sorted nums3:", sortArray(nums3));
@@ -54,3 +69,11 @@ function sortArray(arr) {
 console.log("Sorted nums1:", sortArray(nums1));
 console.log("Sorted nums2:", sortArray(nums2)); 
 console.log("Sorted nums3:", sortArray(nums3)); 
+=======
+// Testing the sortArrayAscending function
+console.log(sortArrayAscending(nums1));
+
+console.log(sortArrayAscending(nums2)); 
+
+console.log(sortArrayAscending(nums3)); 
+>>>>>>> c364c4d66ab18565041830a5a1e3e9d2de987ad1

objects-and-math/exercises/ObjectExercises.js

@@ -13,10 +13,21 @@ let salamander = {
 };
 
 
-// After you have created the other object literals, add the astronautID property to each one.
+superChimpOne.astronautID = "CHAD001";
+salamander.astronautID = "LACEY002";
 
-// Create an array to hold the animal objects.
 
-// Print out the relevant information about each animal.
+let animalArray = [superChimpOne, salamander];
 
-// Start an animal race!
+
+animalArray.forEach(animal => {
+   console.log(`Name: ${animal.name}`);
+   console.log(`Species: ${animal.species}`);
+   console.log(`Mass: ${animal.mass} kg`);
+   console.log(`Age: ${animal.age} years`);
+   console.log(`Astronaut ID: ${animal.astronautID}`);
+   console.log("------------");
+});
+
+
+console.log("The animal race is about to begin!");