Skip to content
Snippets Groups Projects

Master

Open Master
z23020805/gl-solver:master into master
Open ZAYNOUNE Fatima zahrae requested to merge z23020805/gl-solver:master into master
Compare
and
21 files
+ 1376
− 403
Compare changes
  • Side-by-side
  • Inline

Files

.idea/workspace.xml
+ 273
− 42
@@ -4,11 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="a17b64ea-8b68-4cd2-aba6-1780c674b35e" name="Changes" comment="Clean">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
<list default="true" id="a17b64ea-8b68-4cd2-aba6-1780c674b35e" name="Changes" comment="-">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Solver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Solver.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Builder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/fr/univamu/solver/Builder.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/test/java/fr/univamu/solver/TestSolver.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/fr/univamu/solver/TestSolver.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -20,6 +19,40 @@
<ProjectState />
</projectState>
</component>
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
<task path="$PROJECT_DIR$">
<activation />
</task>
<projects_view>
<tree_state>
<expand>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="gl-solver1" type="f1a62948:ProjectNode" />
</path>
<path>
<item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
<item name="gl-solver1" type="f1a62948:ProjectNode" />
<item name="Run Configurations" type="7b0102dc:RunConfigurationsNode" />
</path>
</expand>
<select />
</tree_state>
</projects_view>
</state>
</system>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Record" />
<option value="Interface" />
<option value="Class" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
@@ -32,37 +65,129 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;Gradle.GL-Solver [:fr.univamu.solver.Main.main()].executor&quot;: &quot;Run&quot;,
&quot;Gradle.Tests in 'GL-Solver'.executor&quot;: &quot;Run&quot;,
&quot;Gradle.Tests in 'fr.univamu.solver'.executor&quot;: &quot;Run&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;git-widget-placeholder&quot;: &quot;master&quot;,
&quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"Gradle.Build gl-solver1.executor": "Run",
"Gradle.GL-Solver [:fr.univamu.solver.Main.main()].executor": "Run",
"Gradle.NQueensSolverTest.executor": "Run",
"Gradle.NQueensSolverTest.testSolverWith4Queens.executor": "Run",
"Gradle.TestInterval.TestExploreBiFunctionAdd.executor": "Run",
"Gradle.TestInterval.executor": "Run",
"Gradle.TestInterval.testAdd.executor": "Run",
"Gradle.TestInterval.testAllIntervalsAddition.executor": "Run",
"Gradle.TestInterval.testAllOperations.executor": "Run",
"Gradle.TestInterval.testDivideByZero.executor": "Run",
"Gradle.TestInterval.testExploreBiFunctionAddition.executor": "Run",
"Gradle.TestInterval.testExploreBiFunctionDivision.executor": "Run",
"Gradle.TestInterval.testSubtract.executor": "Run",
"Gradle.TestReducer.executor": "Run",
"Gradle.TestReducer.testReduceAddConstraints.executor": "Run",
"Gradle.TestReducer.testReduceMulConstraints.executor": "Run",
"Gradle.TestReducer.testReduceMultipleConstraints.executor": "Run",
"Gradle.TestReducer.testReduceMultiplicativeConstraint.executor": "Run",
"Gradle.TestReducer.testReduceNotEqualConstraint.executor": "Run",
"Gradle.TestSolver.executor": "Run",
"Gradle.TestSolver.testBuilder.executor": "Run",
"Gradle.TestSolver.testBuilder2.executor": "Run",
"Gradle.TestSolver.testConstraintGreaterEqual.executor": "Run",
"Gradle.TestSolver.testConstraintLess.executor": "Run",
"Gradle.TestSolver.testConstraintLessEqual.executor": "Run",
"Gradle.Tests in 'GL-Solver'.executor": "Run",
"Gradle.Tests in 'fr.univamu.solver'.executor": "Run",
"Gradle.gl-solver1 [:Main.main()].executor": "Run",
"Gradle.gl-solver1 [:NQueensSolver.main()].executor": "Run",
"Gradle.gl-solver1 [:TestSolutions.main()].executor": "Run",
"RunOnceActivity.ShowReadmeOnStart": "true",
"git-widget-placeholder": "master",
"kotlin-language-version-configured": "true",
"last_opened_file_path": "/amuhome/z23020805/Téléchargements/gl-solver1",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"vue.rearranger.settings.migration": "true"
}
}</component>
<component name="RunManager" selected="Gradle.Tests in 'GL-Solver'">
<configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
<option name="MAIN_CLASS_NAME" value="fr.univamu.solver.Main" />
<module name="GL-Solver.main" />
<extension name="coverage">
<pattern>
<option name="PATTERN" value="fr.univamu.solver.*" />
<option name="ENABLED" value="true" />
</pattern>
</extension>
<method v="2">
<option name="Make" enabled="true" />
</method>
}]]></component>
<component name="RecentsManager">
<key name="CopyClassDialog.RECENTS_KEY">
<recent name="fr.univamu.solver" />
</key>
</component>
<component name="RunManager" selected="Gradle.TestSolver.testConstraintLessEqual">
<configuration name="TestSolver" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.TestSolver&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="TestSolver.testBuilder2" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.TestSolver.testBuilder2&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="TestSolver.testConstraintGreaterEqual" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.TestSolver.testConstraintGreaterEqual&quot;" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>false</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="Tests in 'GL-Solver'" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<configuration name="TestSolver.testConstraintLess" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -74,6 +199,8 @@
<option name="taskNames">
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.TestSolver.testConstraintLess&quot;" />
</list>
</option>
<option name="vmOptions" />
@@ -84,7 +211,7 @@
<RunAsTest>true</RunAsTest>
<method v="2" />
</configuration>
<configuration name="Tests in 'fr.univamu.solver'" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<configuration name="TestSolver.testConstraintLessEqual" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -97,7 +224,7 @@
<list>
<option value=":test" />
<option value="--tests" />
<option value="&quot;fr.univamu.solver.*&quot;" />
<option value="&quot;fr.univamu.solver.TestSolver.testConstraintLessEqual&quot;" />
</list>
</option>
<option name="vmOptions" />
@@ -110,17 +237,19 @@
</configuration>
<recent_temporary>
<list>
<item itemvalue="Gradle.Tests in 'GL-Solver'" />
<item itemvalue="Gradle.Tests in 'fr.univamu.solver'" />
<item itemvalue="Application.Main" />
<item itemvalue="Gradle.TestSolver.testConstraintLessEqual" />
<item itemvalue="Gradle.TestSolver.testConstraintLess" />
<item itemvalue="Gradle.TestSolver.testConstraintGreaterEqual" />
<item itemvalue="Gradle.TestSolver" />
<item itemvalue="Gradle.TestSolver.testBuilder2" />
</list>
</recent_temporary>
</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
<option value="bundled-jdk-9823dce3aa75-28b599e66164-intellij.indexing.shared.core-IU-242.23339.11" />
<option value="bundled-js-predefined-d6986cc7102b-5c90d61e3bab-JavaScript-IU-242.23339.11" />
<option value="bundled-jdk-9f38398b9061-39b83d9b5494-intellij.indexing.shared.core-IU-241.17011.79" />
<option value="bundled-js-predefined-1d06a55b98c1-0b3e54e931b4-JavaScript-IU-241.17011.79" />
</set>
</attachedChunks>
</component>
@@ -134,6 +263,11 @@
<updated>1727967430355</updated>
<workItem from="1727967431394" duration="6834000" />
<workItem from="1728024944251" duration="2652000" />
<workItem from="1729257151327" duration="10208000" />
<workItem from="1729505093219" duration="348000" />
<workItem from="1729505456383" duration="14706000" />
<workItem from="1729520395618" duration="2296000" />
<workItem from="1729600850030" duration="4344000" />
</task>
<task id="LOCAL-00001" summary="Create">
<option name="closed" value="true" />
@@ -175,7 +309,79 @@
<option name="project" value="LOCAL" />
<updated>1727988463386</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary="Clean">
<option name="closed" value="true" />
<created>1729261507148</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1729261507148</updated>
</task>
<task id="LOCAL-00007" summary="Clean">
<option name="closed" value="true" />
<created>1729266661450</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1729266661450</updated>
</task>
<task id="LOCAL-00008" summary="-">
<option name="closed" value="true" />
<created>1729508354959</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1729508354959</updated>
</task>
<task id="LOCAL-00009" summary="-">
<option name="closed" value="true" />
<created>1729509851458</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1729509851458</updated>
</task>
<task id="LOCAL-00010" summary="-">
<option name="closed" value="true" />
<created>1729510088474</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1729510088474</updated>
</task>
<task id="LOCAL-00011" summary="-">
<option name="closed" value="true" />
<created>1729510186238</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1729510186238</updated>
</task>
<task id="LOCAL-00012" summary="-">
<option name="closed" value="true" />
<created>1729521360616</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1729521360616</updated>
</task>
<task id="LOCAL-00013" summary="-">
<option name="closed" value="true" />
<created>1729522366644</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1729522366644</updated>
</task>
<task id="LOCAL-00014" summary="-">
<option name="closed" value="true" />
<created>1729604957245</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1729604957245</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -185,6 +391,31 @@
<MESSAGE value="Create" />
<MESSAGE value="Add tests" />
<MESSAGE value="Clean" />
<option name="LAST_COMMIT_MESSAGE" value="Clean" />
<MESSAGE value="-" />
<option name="LAST_COMMIT_MESSAGE" value="-" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/test/java/fr/univamu/solver/TestInterval.java</url>
<line>23</line>
<properties class="fr.univamu.solver.TestInterval" method="testAdd">
<option name="EMULATED" value="true" />
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="1" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-method">
<url>file://$PROJECT_DIR$/src/test/java/fr/univamu/solver/TestSolver.java</url>
<line>131</line>
<properties class="fr.univamu.solver.TestSolver" method="testBuilder2">
<option name="EMULATED" value="true" />
<option name="WATCH_EXIT" value="false" />
</properties>
<option name="timeStamp" value="2" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
</project>
\ No newline at end of file