diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8b47de848b6aaef081135042a50bfa103f2fab08..0c25938922a2469b55d984337939f1eca05c2103 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,12 +12,20 @@
</component>
<component name="ChangeListManager">
<list default="true" id="71079116-ceb9-4641-9687-7ec288d1d1cd" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/4" beforeDir="false" />
- <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Progress/5" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/Makefile" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/pointeurs/pointer_sort" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/pointer_sort" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/pointeurs/circ_list.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/circ_list.c" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/pointeurs/circ_list.o" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/circ_list.o" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/pointeurs/joseph" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/joseph" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/pointeurs/joseph.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/joseph.c" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/src/pointeurs/joseph.o" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/joseph.o" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/src/pointeurs/pointer_sort.o" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/pointer_sort.o" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -30,28 +38,10 @@
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="212" selection-start-line="5" selection-start-column="212" selection-end-line="5" selection-end-column="212" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.h">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="225">
- <caret line="15" selection-start-line="15" selection-end-line="15" selection-end-column="50" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
+ <state relative-caret-position="330">
+ <caret line="22" column="56" selection-start-line="22" selection-start-column="56" selection-end-line="22" selection-end-column="56" />
</state>
</provider>
</entry>
@@ -59,35 +49,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="504">
- <caret line="92" column="20" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/matrix_compute.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="1" selection-start-line="5" selection-start-column="1" selection-end-line="5" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- </file>
- <file pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/pointer_sort.c">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
+ <state relative-caret-position="319">
+ <caret line="42" column="47" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
<folding>
<element signature="e#52#71#0" expanded="true" />
</folding>
@@ -96,10 +59,13 @@
</entry>
</file>
<file pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/pointeurs/Makefile">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.c">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="39" selection-start-column="39" selection-end-column="39" />
+ <state relative-caret-position="459">
+ <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
+ <folding>
+ <element signature="e#52#71#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
@@ -119,11 +85,12 @@
<option value="$PROJECT_DIR$/circ_list.c" />
<option value="$PROJECT_DIR$/matrix.c" />
<option value="$PROJECT_DIR$/CMakeLists.txt" />
- <option value="$PROJECT_DIR$/src/pointeurs/joseph.c" />
<option value="$PROJECT_DIR$/src/pointeurs/matrix.c" />
- <option value="$PROJECT_DIR$/src/pointeurs/matrix_compute.c" />
- <option value="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" />
<option value="$PROJECT_DIR$/src/pointeurs/Makefile" />
+ <option value="$PROJECT_DIR$/src/pointeurs/circ_list.c" />
+ <option value="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" />
+ <option value="$PROJECT_DIR$/src/pointeurs/matrix_compute.c" />
+ <option value="$PROJECT_DIR$/src/pointeurs/joseph.c" />
</list>
</option>
</component>
@@ -220,12 +187,12 @@
<workItem from="1556097866972" duration="2687000" />
<workItem from="1556539850846" duration="585000" />
<workItem from="1556542460421" duration="1743000" />
- <workItem from="1557221452887" duration="2862000" />
+ <workItem from="1557221452887" duration="11027000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="15263000" />
+ <option name="totallyTimeSpent" value="23428000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -240,7 +207,7 @@
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.27106228" />
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.27106228" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@@ -252,7 +219,7 @@
<window_info anchor="bottom" id="TODO" order="6" weight="0.32959184" />
<window_info anchor="bottom" id="Database Changes" order="7" />
<window_info anchor="bottom" id="Messages" order="8" weight="0.32959184" />
- <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32959184" />
+ <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.32959184" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="11" weight="0.32959184" />
<window_info anchor="bottom" id="CMake" order="12" weight="0.32959184" />
@@ -271,23 +238,20 @@
</entry>
<entry file="file://$PROJECT_DIR$/main.c" />
<entry file="file://$PROJECT_DIR$/src/pointeurs/test.c" />
- <entry file="file://$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake">
- <provider selected="true" editor-type-id="text-editor" />
- </entry>
- <entry file="file://$PROJECT_DIR$/cmake-build-debug/Makefile">
+ <entry file="file://$PROJECT_DIR$/Makefile">
<provider selected="true" editor-type-id="text-editor" />
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.h">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="330">
- <caret line="22" column="56" selection-start-line="22" selection-start-column="56" selection-end-line="22" selection-end-column="56" />
+ <state relative-caret-position="270">
+ <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/Makefile">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="75">
- <caret line="5" column="212" selection-start-line="5" selection-start-column="212" selection-end-line="5" selection-end-column="212" />
+ <state>
+ <caret column="26" lean-forward="true" selection-start-column="5" selection-end-column="26" />
</state>
</provider>
</entry>
@@ -298,13 +262,17 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Makefile">
- <provider selected="true" editor-type-id="text-editor" />
+ <entry file="file://$PROJECT_DIR$/CMakeLists.txt">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="212" selection-start-line="5" selection-start-column="212" selection-end-line="5" selection-end-column="212" />
+ </state>
+ </provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.c">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.h">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="270">
- <caret line="19" column="16" selection-start-line="19" selection-start-column="16" selection-end-line="19" selection-end-column="16" />
+ <state relative-caret-position="330">
+ <caret line="22" column="56" selection-start-line="22" selection-start-column="56" selection-end-line="22" selection-end-column="56" />
</state>
</provider>
</entry>
@@ -315,34 +283,47 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.c">
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="1" lean-forward="true" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
- </state>
+ <state relative-caret-position="-187" />
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.c">
+ <entry file="file://$PROJECT_DIR$/cmake-build-debug/Makefile">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/pointer_sort.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="504">
- <caret line="92" column="20" selection-start-line="92" selection-start-column="20" selection-end-line="92" selection-end-column="20" />
+ <state relative-caret-position="421">
+ <caret line="50" selection-start-line="50" selection-end-line="50" />
+ <folding>
+ <element signature="e#52#71#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/pointer_sort.c">
+ <entry file="file://$PROJECT_DIR$/joseph.ref">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/mat_A_2_4.dat">
+ <provider selected="true" editor-type-id="text-editor" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.c">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="324">
- <caret line="44" column="51" selection-start-line="44" selection-start-column="51" selection-end-line="44" selection-end-column="51" />
+ <state relative-caret-position="319">
+ <caret line="42" column="47" selection-start-line="42" selection-start-column="47" selection-end-line="42" selection-end-column="47" />
<folding>
<element signature="e#52#71#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/pointeurs/Makefile">
+ <entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.c">
<provider selected="true" editor-type-id="text-editor">
- <state>
- <caret column="39" selection-start-column="39" selection-end-column="39" />
+ <state relative-caret-position="459">
+ <caret line="44" column="22" selection-start-line="44" selection-start-column="22" selection-end-line="44" selection-end-column="22" />
+ <folding>
+ <element signature="e#52#71#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache
index 90c6eb3fbe9b2959075b9e6c94d358acae802f2f..55beead857b8f558d794110b1f0384208a966d77 100644
--- a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache
+++ b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache
@@ -6,13 +6,17 @@
#IncludeRegexTransform:
-/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/matrix_compute.c
+/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/circ_list.h
+stdbool.h
+-
-/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/pointer_sort.c
+/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/joseph.c
stdlib.h
-
-time.h
--
stdio.h
-
+string.h
+-
+circ_list.h
+/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/circ_list.h
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal
index 2fb46821b2883ae1de654f509a23ed2489cb0d7d..59d7d0988eff83dcbb05a9fe471ea6a9e5d0e700 100644
--- a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal
+++ b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.internal
@@ -5,6 +5,7 @@ CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/circ_list.c
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/circ_list.h
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o
+ /Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/circ_list.h
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/joseph.c
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix.c.o
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/matrix.c
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make
index 14fe262c94ce1144cc313d81f1614c9b678154d4..eeab16df6585e8e0e75057b139674a9469ba6d24 100644
--- a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make
+++ b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/depend.make
@@ -4,6 +4,7 @@
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o: ../src/pointeurs/circ_list.c
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o: ../src/pointeurs/circ_list.h
+CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o: ../src/pointeurs/circ_list.h
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o: ../src/pointeurs/joseph.c
CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix.c.o: ../src/pointeurs/matrix.c
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o
index cb393200a86641792ab24c637422a66ace5e8dcf..51ddd701df2a01188adbd8252377e802d858d354 100644
Binary files a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o and b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/circ_list.c.o differ
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o
index 18a3e011ce77c4e481207fb02bc0a414d90f8cb4..88a6ee36d5d250a67222e3bce40511054c2f4230 100644
Binary files a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o and b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/joseph.c.o differ
diff --git a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o
index d84b8de989bfa438b1c5e16d8e23ff87a61a3224..52c58e4fc3832ea176f6d78c85cdc05d4e83ec0c 100644
Binary files a/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o and b/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o differ
diff --git a/cmake-build-debug/CMakeFiles/Progress/2 b/cmake-build-debug/CMakeFiles/Progress/2
new file mode 100644
index 0000000000000000000000000000000000000000..7b4d68d70fcae134d5348f5e118f5e9c9d3f05f6
--- /dev/null
+++ b/cmake-build-debug/CMakeFiles/Progress/2
@@ -0,0 +1 @@
+empty
\ No newline at end of file
diff --git a/src/pointeurs/Makefile b/src/pointeurs/Makefile
index 9fc958fdc497a15ddd5474065073e62acf47a0fd..8d8b19c579c8fe845393381c54a862fb29a1eb6f 100644
--- a/src/pointeurs/Makefile
+++ b/src/pointeurs/Makefile
@@ -1,4 +1,4 @@
-all: pointer_sort joseph matrix_compute
+all: joseph matrix_compute pointer_sort
joseph: joseph.o circ_list.o
gcc -o joseph joseph.o circ_list.o
diff --git a/src/pointeurs/circ_list.c b/src/pointeurs/circ_list.c
index 0454e84cb13f2a9b13d9b7f105f65e4c17fd7d6a..ece8066d92dfb425a3ac9b90f00fe82de73f9a91 100644
--- a/src/pointeurs/circ_list.c
+++ b/src/pointeurs/circ_list.c
@@ -6,7 +6,7 @@
#include "circ_list.h"
Element* list_create() {
- Element *element;
+ Element *element = malloc(sizeof(Element));
element->content = NULL;
element->next = NULL;
return element;
@@ -26,13 +26,13 @@ unsigned int list_count(Element* head) {
}
Element* list_move(Element* head) {
- Element *element;
+ Element *element = malloc(sizeof(Element));
element = head->next;
return element;
}
Element* list_insert_after(Element* head, void* data) {
- Element *element;
+ Element *element = malloc(sizeof(Element));
element->content = data;
element->next = head->next;
head->next = element;
@@ -40,7 +40,7 @@ Element* list_insert_after(Element* head, void* data) {
}
Element* list_insert_before(Element* head, void* data) {
- Element *element;
+ Element *element = malloc(sizeof(Element));
element->next = head;
element->content = data;
return element;
diff --git a/src/pointeurs/circ_list.o b/src/pointeurs/circ_list.o
index d84b2755949e7cff822cb3cf68dde375a53cad2c..274bdee1f0b0ee7987ba3115a5a06bfa1578b45a 100644
Binary files a/src/pointeurs/circ_list.o and b/src/pointeurs/circ_list.o differ
diff --git a/src/pointeurs/joseph b/src/pointeurs/joseph
index 4d68f86cd281df42c84cf0e66dd2cb8ef1b4e4ee..ef76535844a8aeb7f90e47e85cdba0dd0d7dfe97 100755
Binary files a/src/pointeurs/joseph and b/src/pointeurs/joseph differ
diff --git a/src/pointeurs/joseph.c b/src/pointeurs/joseph.c
index 2815fe8b1506ab0ead0329c82d68711254d65ecb..b70df371db7b9c70a743a12595bc2cfd6f026544 100644
--- a/src/pointeurs/joseph.c
+++ b/src/pointeurs/joseph.c
@@ -2,6 +2,48 @@
// Created by Ottavio Buonomo on 2019-04-19.
//
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include "circ_list.h"
+
+Element* insert(Element *head, void* value) {
+ if (list_empty(head)) {
+ Element *newElement = malloc(sizeof(Element));
+ newElement->content = value;
+ newElement->next = newElement;
+ return newElement;
+ } else {
+ return list_insert_after(head, value);
+ }
+}
+
+Element* delete(Element *head, int jump) {
+ Element *p = head;
+ Element *q = head;
+
+ while (p->next != p) {
+ for (int i = 0; i < jump - 1; ++i) {
+ q = p;
+ p = p->next;
+ }
+ q->next = p->next;
+ printf("%d\n", p->content);
+ free(p);
+ p = q->next;
+ }
+
+ head = p;
+ return head;
+}
+
int main() {
+ Element *head = list_create();
+ for (int i = 1; i <= 8; ++i) {
+ head = insert(head, i);
+ }
+ head = head->next;
+ printf("\n");
+ printf("%d\n",delete(head, 3)->content);
return 0;
}
\ No newline at end of file
diff --git a/src/pointeurs/joseph.o b/src/pointeurs/joseph.o
index 166fc02ad4b9cf70210270f138c98cca10b2a70b..4cdd5ab39e1a54343208092d7824877bd19e0b5f 100644
Binary files a/src/pointeurs/joseph.o and b/src/pointeurs/joseph.o differ
diff --git a/src/pointeurs/pointer_sort.c b/src/pointeurs/pointer_sort.c
index 735e031cc9f3d64a7f6a45628a1d84305b4e71cb..1dfc3752ff4b635f1d56f051c4453f55d052132b 100644
--- a/src/pointeurs/pointer_sort.c
+++ b/src/pointeurs/pointer_sort.c
@@ -6,7 +6,6 @@
#include <time.h>
#include <stdio.h>
-#define ARRAY_SIZE 6
/// Echange deux nombres
/// \param a - nombre 1