Skip to content
Snippets Groups Projects
Commit b267443e authored by ottavio.buonomo's avatar ottavio.buonomo
Browse files

Makefile OK

parent 4cf75d92
Branches
No related tags found
No related merge requests found
Pipeline #5667 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 153 additions and 110 deletions
.DS_Store
+ 0
− 0
View file @ b267443e
No preview for this file type
.idea/workspace.xml
+ 78
− 70
View file @ b267443e
......@@ -12,29 +12,18 @@
</component>
<component name="ChangeListManager">
<list default="true" id="71079116-ceb9-4641-9687-7ec288d1d1cd" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/pointeurs/matrix_compute.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/CMakeLists.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/circ_list.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/circ_list.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/circ_list.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/circ_list.h" 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/DependInfo.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/DependInfo.cmake" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/build.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/build.make" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/cmake_clean.cmake" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/cmake_clean.cmake" 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/link.txt" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/link.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/main.c.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/matrix.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/matrix.c.o" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix.c.o" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix_compute.c.o" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix_compute.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$/cmake-build-debug/DoublesPointeurs" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/DoublesPointeurs.cbp" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/DoublesPointeurs.cbp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmake-build-debug/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/joseph.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/joseph.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/matrix.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/matrix.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/matrix.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/matrix.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pointer_sort.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/joseph.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/matrix.o" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/Makefile" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/matrix.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/matrix.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/matrix_compute.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/matrix_compute.c" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" beforeDir="false" afterPath="$PROJECT_DIR$/src/pointeurs/pointer_sort.c" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -56,33 +45,51 @@
</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" />
<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/joseph.c">
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<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>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.h">
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.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="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/circ_list.c">
<entry file="file://$PROJECT_DIR$/src/pointeurs/Makefile">
<provider selected="true" editor-type-id="text-editor" />
</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="1365">
<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="60">
<caret line="4" selection-start-line="4" 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>
......@@ -91,7 +98,7 @@
<entry file="file://$PROJECT_DIR$/src/pointeurs/pointer_sort.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
<caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
<caret line="48" column="1" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
</state>
</provider>
</entry>
......@@ -112,6 +119,8 @@
<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" />
</list>
</option>
......@@ -199,12 +208,13 @@
<workItem from="1555925662425" duration="1702000" />
<workItem from="1556097866972" duration="2687000" />
<workItem from="1556539850846" duration="585000" />
<workItem from="1556542460421" duration="1135000" />
<workItem from="1556542460421" duration="1743000" />
<workItem from="1557221452887" duration="1246000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="11793000" />
<option name="totallyTimeSpent" value="13647000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
......@@ -217,9 +227,8 @@
</component>
<component name="ToolWindowManager">
<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.26800978" />
<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" />
......@@ -230,7 +239,7 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<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" visible="true" weight="0.32959184" />
<window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.32959184" />
<window_info anchor="bottom" id="Terminal" order="9" 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" />
......@@ -248,74 +257,73 @@
<entry file="file://$PROJECT_DIR$/cmake-build-debug/CMakeFiles/Makefile2">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/main.c">
<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">
<provider selected="true" editor-type-id="text-editor" />
</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="165">
<caret line="11" column="27" selection-start-line="11" selection-start-column="27" selection-end-line="11" selection-end-column="27" />
<folding>
<element signature="e#52#71#0" expanded="true" />
</folding>
<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>
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.h">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<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 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/test.c">
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="2" lean-forward="true" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
<state relative-caret-position="225">
<caret line="15" selection-start-line="15" selection-end-line="15" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/cmake_install.cmake">
<entry file="file://$PROJECT_DIR$/Makefile">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix.c">
<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 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$/cmake-build-debug/Makefile">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix_compute.c">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.c">
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
<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>
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.h">
<entry file="file://$PROJECT_DIR$/src/pointeurs/Makefile">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/src/pointeurs/joseph.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="60">
<caret line="4" selection-start-line="4" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/pointeurs/circ_list.c">
<entry file="file://$PROJECT_DIR$/src/pointeurs/matrix_compute.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1365">
<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="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>
<entry file="file://$PROJECT_DIR$/src/pointeurs/pointer_sort.c">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="520">
<caret line="44" column="1" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
<caret line="48" column="1" selection-start-line="48" selection-start-column="1" selection-end-line="48" selection-end-column="1" />
</state>
</provider>
</entry>
......
Makefile 0 → 100644
+ 36
− 0
View file @ b267443e
# Run "make STUDENT=xyz" where xyz is the directory to run the tests for
EXES=joseph pointer_sort matrix_compute
TESTS=$(addprefix test_,$(EXES))
CHECK=./check_output
RM=/bin/rm -f
all: $(TESTS)
test_joseph: $(STUDENT)/joseph
@echo "[1]-------------------------------------------------"
@echo "Running $< tests..."
@./$< 17 7 > $<.candidate
@$(CHECK) $(notdir $<.ref) $<.candidate
test_pointer_sort: $(STUDENT)/pointer_sort
@echo "[2]-------------------------------------------------"
@echo "Running $< tests..."
@./$< 51 86 -16 4 23 -13 77 -20 49 65 -38 27 41 0 -3 19 > $<.candidate
@$(CHECK) $(notdir $<.ref) $<.candidate
# sed is used to leave one decimal zero otherwise diff won't work
test_matrix_compute: $(STUDENT)/matrix_compute
@echo "[3]-------------------------------------------------"
@echo "Running $< tests..."
@echo "[3a] transpose"
@./$< transpose mat_A_2_4.dat > $(STUDENT)/mat.trans.candidate
@$(CHECK) mat_At_4_2.ref $(STUDENT)/mat.trans.candidate
@echo "[3b] add"
@./$< add mat_B_3_2.dat mat_C_3_2.dat > $(STUDENT)/mat.add.candidate
@$(CHECK) mat_B_add_C_3_2.ref $(STUDENT)/mat.add.candidate
@echo "[3c] multiply"
@./$< mult mat_D_2_3.dat mat_E_3_2.dat > $(STUDENT)/mat.mul.candidate
@$(CHECK) mat_E_mul_E_2_2.ref $(STUDENT)/mat.mul.candidate
clean:
@$(RM) $(STUDENT)/$(EXES) $(STUDENT)/*.o $(STUDENT)/*.candidate
cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/C.includecache
+ 2
− 0
View file @ b267443e
......@@ -6,6 +6,8 @@
#IncludeRegexTransform:
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/matrix_compute.c
/Users/ottavio/Documents/C/DoublesPointeurs/DoublesPointeurs/src/pointeurs/pointer_sort.c
stdlib.h
-
......
cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix.c.o
+ 0
− 0
View file @ b267443e
No preview for this file type
cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/matrix_compute.c.o
+ 0
− 0
View file @ b267443e
No preview for this file type
cmake-build-debug/CMakeFiles/DoublesPointeurs.dir/src/pointeurs/pointer_sort.c.o
+ 0
− 0
View file @ b267443e
No preview for this file type
cmake-build-debug/CMakeFiles/Progress/4 0 → 100644
+ 1
− 0
View file @ b267443e
empty
\ No newline at end of file
cmake-build-debug/CMakeFiles/Progress/5 0 → 100644
+ 1
− 0
View file @ b267443e
empty
\ No newline at end of file
cmake-build-debug/CMakeFiles/Progress/6 0 → 100644
+ 1
− 0
View file @ b267443e
empty
\ No newline at end of file
cmake-build-debug/CMakeFiles/Progress/count.txt 0 → 100644
+ 1
− 0
View file @ b267443e
6
joseph.o deleted 100644 → 0
+ 0
− 0
View file @ 4cf75d92
File deleted
matrix.o deleted 100644 → 0
+ 0
− 0
View file @ 4cf75d92
File deleted
src/pointeurs/.DS_Store
+ 0
− 0
View file @ b267443e
No preview for this file type
src/pointeurs/Makefile
+ 26
− 34
View file @ b267443e
# Run "make STUDENT=xyz" where xyz is the directory to run the tests for
EXES=joseph pointer_sort matrix_compute
TESTS=$(addprefix test_,$(EXES))
CHECK=./check_output
RM=/bin/rm -f
all: $(TESTS)
test_joseph: $(STUDENT)/joseph
@echo "[1]-------------------------------------------------"
@echo "Running $< tests..."
@./$< 17 7 > $<.candidate
@$(CHECK) $(notdir $<.ref) $<.candidate
test_pointer_sort: $(STUDENT)/pointer_sort
@echo "[2]-------------------------------------------------"
@echo "Running $< tests..."
@./$< 51 86 -16 4 23 -13 77 -20 49 65 -38 27 41 0 -3 19 > $<.candidate
@$(CHECK) $(notdir $<.ref) $<.candidate
# sed is used to leave one decimal zero otherwise diff won't work
test_matrix_compute: $(STUDENT)/matrix_compute
@echo "[3]-------------------------------------------------"
@echo "Running $< tests..."
@echo "[3a] transpose"
@./$< transpose mat_A_2_4.dat > $(STUDENT)/mat.trans.candidate
@$(CHECK) mat_At_4_2.ref $(STUDENT)/mat.trans.candidate
@echo "[3b] add"
@./$< add mat_B_3_2.dat mat_C_3_2.dat > $(STUDENT)/mat.add.candidate
@$(CHECK) mat_B_add_C_3_2.ref $(STUDENT)/mat.add.candidate
@echo "[3c] multiply"
@./$< mult mat_D_2_3.dat mat_E_3_2.dat > $(STUDENT)/mat.mul.candidate
@$(CHECK) mat_E_mul_E_2_2.ref $(STUDENT)/mat.mul.candidate
all: Joseph matrix_compute pointer_sort
joseph: joseph.o circ_list.o
gcc -o joseph joseph.o circ_list.o
joseph.o: joseph.c
gcc -o joseph.o -c joseph.c
circ_list.o: circ_list.c circ_list.h
gcc -o circ_list.o -c circ_list.c
matrix_compute: matrix_compute.o matrix.o
gcc -o matrix_compute matrix_compute.o matrix.o
matrix_compute.o: matrix_compute.c
gcc -o matrix_compute.o -c matrix_compute.c
matrix.o: matrix.c matrix.h
gcc -o matrix.o -c matrix.c
pointer_sort: pointer_sort.o
gcc -o pointer_sort pointer_sort.o
pointer_sort.o: pointer_sort.c
gcc -o pointer_sort.o -c pointer_sort.c
clean:
@$(RM) $(STUDENT)/$(EXES) $(STUDENT)/*.o $(STUDENT)/*.candidate
rm -f joseph joseph.o circ_list.o matrix_compute matrix_compute.o matrix.o pointer_sort pointer_sort.o
src/pointeurs/matrix.c
+ 4
− 5
View file @ b267443e
......@@ -7,16 +7,15 @@
m_double* matrix_alloc(unsigned int row, unsigned int col) {
m_double *matrix = malloc(sizeof(m_double));
matrix->row = row;
matrix->col = col;
matrix->content = NULL;
return matrix;
}
m_double* matrix_mult(m_double* m1, m_double* m2) {
if (m1->col != m2->row) {
/*if (m1->col != m2->row) {
return NULL;
} else {
}
}*/
return NULL;
}
\ No newline at end of file
src/pointeurs/matrix.o 0 → 100644
+ 0
− 0
View file @ b267443e
File added
src/pointeurs/matrix_compute 0 → 100755
+ 0
− 0
View file @ b267443e
File added
src/pointeurs/matrix_compute.c
+ 3
− 1
View file @ b267443e
//
// Created by Ottavio Buonomo on 2019-04-29.
//
int main() {
return 0;
}
src/pointeurs/matrix_compute.o 0 → 100644
+ 0
− 0
View file @ b267443e
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment