From d9f902a5b9b6b2c42df3ba03eeafe21d876352e2 Mon Sep 17 00:00:00 2001
From: Carolista <cjones.renaissancewoman@gmail.com>
Date: Tue, 3 Jun 2025 20:55:36 -0400
Subject: [PATCH 1/2] coded solution during class

---
 .idea/misc.xml                                |  2 +-
 .idea/workspace.xml                           | 80 +++++++++++++++++--
 pom.xml                                       |  4 +-
 .../org/example/ConditionalExercises.java     | 21 ++++-
 src/main/java/org/example/LoopExercises.java  | 33 +++++++-
 src/test/java/LoopExercisesTests.java         |  8 ++
 6 files changed, 135 insertions(+), 13 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index e122dea..fdc35ea 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_23" default="true" project-jdk-name="openjdk-23" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3afe1c1..f94e59e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="a5255b3c-d517-44b9-92ad-783cf1cec81d" name="Changes" comment="Addimg images" />
+    <list default="true" id="a5255b3c-d517-44b9-92ad-783cf1cec81d" name="Changes" comment="Addimg images">
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/ConditionalExercises.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/example/ConditionalExercises.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/LoopExercises.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/example/LoopExercises.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/LoopExercisesTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/LoopExercisesTests.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -20,11 +27,23 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
+  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
+  "lastFilter": {
+    "state": "OPEN",
+    "assignee": "Carolista"
+  }
+}]]></component>
+  <component name="GithubPullRequestsUISettings"><![CDATA[{
+  "selectedUrlAndAccountId": {
+    "url": "https://github.com/Carolista/software-dev-course-java-basics-3-demo.git",
+    "accountId": "cccb2ce8-290b-4d89-b99e-7386737c7e96"
+  }
+}]]></component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 2
 }</component>
   <component name="ProjectId" id="2sifyuXbXnLKnVkWLgGMoBfhHnh" />
-  <component name="ProjectLevelVcsManager">
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectViewState">
@@ -35,6 +54,9 @@
   "keyToString": {
     "Application.Main.executor": "Run",
     "JUnit.ConditionalExercisesTests.executor": "Run",
+    "JUnit.LoopExercisesTests.testSum.executor": "Run",
+    "JUnit.LoopExercisesTests.testSumBackwardsUntilEven.executor": "Run",
+    "JUnit.LoopExercisesTests.testSumUntilEven.executor": "Run",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
@@ -42,11 +64,11 @@
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "/home/mikel/projects/java-new-curriculum/software-dev-course-classes-and-objects-2/pom.xml",
     "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0"
+    "project.structure.proportion": "0.15",
+    "project.structure.side.proportion": "0.2"
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="JUnit.LoopExercisesTests.testSumBackwardsUntilEven">
     <configuration name="ConditionalExercisesTests" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="software-dev-course-java-basics-3" />
       <option name="PACKAGE_NAME" value="" />
@@ -56,8 +78,41 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="LoopExercisesTests.testSum" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="software-dev-course-java-basics-3" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="LoopExercisesTests" />
+      <option name="METHOD_NAME" value="testSum" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="LoopExercisesTests.testSumBackwardsUntilEven" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="software-dev-course-java-basics-3" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="LoopExercisesTests" />
+      <option name="METHOD_NAME" value="testSumBackwardsUntilEven" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="LoopExercisesTests.testSumUntilEven" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="software-dev-course-java-basics-3" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="LoopExercisesTests" />
+      <option name="METHOD_NAME" value="testSumUntilEven" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.LoopExercisesTests.testSumBackwardsUntilEven" />
+        <item itemvalue="JUnit.LoopExercisesTests.testSumUntilEven" />
+        <item itemvalue="JUnit.LoopExercisesTests.testSum" />
         <item itemvalue="JUnit.ConditionalExercisesTests" />
       </list>
     </recent_temporary>
@@ -95,4 +150,19 @@
     <MESSAGE value="Addimg images" />
     <option name="LAST_COMMIT_MESSAGE" value="Addimg images" />
   </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-method">
+          <url>file://$PROJECT_DIR$/src/test/java/ConditionalExercisesTests.java</url>
+          <line>7</line>
+          <properties class="ConditionalExercisesTests" method="testLessThanFive">
+            <option name="EMULATED" value="true" />
+            <option name="WATCH_EXIT" value="false" />
+          </properties>
+          <option name="timeStamp" value="1" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 4bc6aa6..87f401b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>23</maven.compiler.source>
-        <maven.compiler.target>23</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
diff --git a/src/main/java/org/example/ConditionalExercises.java b/src/main/java/org/example/ConditionalExercises.java
index ba577bd..af7883d 100644
--- a/src/main/java/org/example/ConditionalExercises.java
+++ b/src/main/java/org/example/ConditionalExercises.java
@@ -4,14 +4,25 @@ public class ConditionalExercises {
     public boolean lessThanFive(int x) {
         // Replace the line below with code that returns true if x is less than 5, and false otherwise
         // (use an if statement with an else block.)
-        return false;
+        if (x<5) {
+            return true;
+        } else {
+            return false;
+        }
+//        return x < 5;
     }
 
     public String getAgeGroup(int age) {
         // Replace the line below with code that returns "child" if age is less than 13,
         // "teen" if age is less than 20, and "adult" otherwise
         // (use if, else if, and else)
-        return "";
+        if (age >= 20) {
+            return "adult";
+        } else if (age >= 13) {
+            return "teen";
+        } else {
+            return "child";
+        }
     }
 
     public boolean isValidPassword(String password) {
@@ -20,6 +31,10 @@ public boolean isValidPassword(String password) {
         // Replace the line below with code that returns true if password is at least 8 characters long
         // and false otherwise
         // (use an if statement with an else block.)
-        return false;
+        if (passwordLength < 8) {
+            return false;
+        } else {
+            return true;
+        }
     }
 }
diff --git a/src/main/java/org/example/LoopExercises.java b/src/main/java/org/example/LoopExercises.java
index ff1aee6..fc119c5 100644
--- a/src/main/java/org/example/LoopExercises.java
+++ b/src/main/java/org/example/LoopExercises.java
@@ -4,13 +4,42 @@ public class LoopExercises {
     public int sum(int n) {
         // Replace the line below with code that returns the sum of the numbers from 1 to n
         // (use a for loop)
-        return 0;
+        int total = 0;
+        for (int i = 1; i <= n; i++) {
+            total += i;
+        }
+        return total;
     }
 
     public int sumUntilEven(int n) {
         // Replace the line below with code that returns the sum of the numbers from 1 to n
         // but stops adding when the sum is even
         // (use a while loop with a sum variable and a counter variable)
-        return 0;
+        int sum = 0;
+        int i = 1;
+        while (i<=n) {
+            sum += i;
+            if (sum % 2 == 0) {
+                break;
+            }
+            i++;
+        }
+        return sum;
+    }
+
+    public int sumBackwardsUntilEven(int n) {
+        // Replace the line below with code that returns the sum of the numbers from 1 to n
+        // but stops adding when the sum is even
+        // (use a while loop with a sum variable and a counter variable)
+        int sum = 0;
+        int i = n;
+        while (i > 0) {
+            sum += i;
+            if (sum % 2 == 0) {
+                break;
+            }
+            i++;
+        }
+        return sum;
     }
 }
diff --git a/src/test/java/LoopExercisesTests.java b/src/test/java/LoopExercisesTests.java
index ca8f332..84a7fcd 100644
--- a/src/test/java/LoopExercisesTests.java
+++ b/src/test/java/LoopExercisesTests.java
@@ -17,4 +17,12 @@ public void testSumUntilEven() {
         assert loopExercises.sumUntilEven(10) == 6;
         assert loopExercises.sumUntilEven(100) == 6;
     }
+
+    @Test
+    public void testSumBackwardsUntilEven() {
+        LoopExercises loopExercises = new LoopExercises();
+        assert loopExercises.sumBackwardsUntilEven(39) == 120;
+        assert loopExercises.sumBackwardsUntilEven(97) == 294;
+        assert loopExercises.sumBackwardsUntilEven(241) == 726;
+    }
 }

From 9409076d6dd23e0a52183895ce46d55b5b18fada Mon Sep 17 00:00:00 2001
From: Ben <bendanderson13@gmail.com>
Date: Tue, 3 Jun 2025 23:36:38 -0500
Subject: [PATCH 2/2] completed work

---
 .idea/workspace.xml | 46 +++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 33 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f94e59e..e75cd67 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,12 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="a5255b3c-d517-44b9-92ad-783cf1cec81d" name="Changes" comment="Addimg images">
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/ConditionalExercises.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/example/ConditionalExercises.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/LoopExercises.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/org/example/LoopExercises.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/LoopExercisesTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/LoopExercisesTests.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -27,23 +22,23 @@
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
-  <component name="GitHubPullRequestSearchHistory"><![CDATA[{
-  "lastFilter": {
-    "state": "OPEN",
-    "assignee": "Carolista"
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;Carolista&quot;
   }
-}]]></component>
-  <component name="GithubPullRequestsUISettings"><![CDATA[{
-  "selectedUrlAndAccountId": {
-    "url": "https://github.com/Carolista/software-dev-course-java-basics-3-demo.git",
-    "accountId": "cccb2ce8-290b-4d89-b99e-7386737c7e96"
+}</component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/Carolista/software-dev-course-java-basics-3-demo.git&quot;,
+    &quot;accountId&quot;: &quot;cccb2ce8-290b-4d89-b99e-7386737c7e96&quot;
   }
-}]]></component>
+}</component>
   <component name="ProjectColorInfo">{
   &quot;associatedIndex&quot;: 2
 }</component>
   <component name="ProjectId" id="2sifyuXbXnLKnVkWLgGMoBfhHnh" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+  <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
   </component>
   <component name="ProjectViewState">
@@ -60,7 +55,7 @@
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "RunOnceActivity.git.unshallow": "true",
     "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "git-widget-placeholder": "main",
+    "git-widget-placeholder": "solution",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "/home/mikel/projects/java-new-curriculum/software-dev-course-classes-and-objects-2/pom.xml",
     "project.structure.last.edited": "Project",
@@ -68,7 +63,7 @@
     "project.structure.side.proportion": "0.2"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.LoopExercisesTests.testSumBackwardsUntilEven">
+  <component name="RunManager">
     <configuration name="ConditionalExercisesTests" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="software-dev-course-java-basics-3" />
       <option name="PACKAGE_NAME" value="" />
@@ -150,19 +145,4 @@
     <MESSAGE value="Addimg images" />
     <option name="LAST_COMMIT_MESSAGE" value="Addimg images" />
   </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="java-method">
-          <url>file://$PROJECT_DIR$/src/test/java/ConditionalExercisesTests.java</url>
-          <line>7</line>
-          <properties class="ConditionalExercisesTests" method="testLessThanFive">
-            <option name="EMULATED" value="true" />
-            <option name="WATCH_EXIT" value="false" />
-          </properties>
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
 </project>
\ No newline at end of file