ENSEEIHT/projet-programmation-imperative
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

c'est plus pratique d'utiliser un type tableau directement...

Browse source 
+ fix: prefix for "Length" attribute may not be private type

git-svn-id: http://cregut.svn.enseeiht.fr/2020/1sn/pim/projets/GH-05@207551 e13453a9-b01f-0410-a051-f404c4f0c485
This commit is contained in:
lfainsin 2020-12-07 22:03:27 +00:00
parent 9f321ff6cb
commit 60005a1eb6
5 changed files with 119 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
src/googleNaive.adb
View file

@ -1,91 +0,0 @@
package body googleNaive is
function "*"(left, right: T_Google) return T_Google is
mat: T_Google;
n: Positive := left.dim(0);
m: Positive := right.dim(1);
l: Positive := left.dim(1);
Compteur: T_Element := 0;
begin
initialize(mat);
for i in 0..n loop
for j in 0..m loop
for k in 0..l loop
Compteur := Compteur + left.matrix(i)(k)*right.matrix(k)(j);
end loop;
mat.matrix(i)(j) := Compteur;
end loop;
end loop;
return mat;
end "*";
function "+"(left, right: T_Google) return T_Google is
n: Positive := left.dim(0);
m: Positive := left.dim(1);
mat: T_Google;
begin
initialize(mat);
for i in 0..n loop
for j in 0..m loop
mat(i)(j) := left.matrix(i)(j) + right.matrix(i)(j);
end loop;
end loop;
return mat;
end "+";
function "*"(left: T_Google; right: Integer) return T_Google is
n: Positive := left.dim(0);
m: Positive := left.dim(1);
mat: T_Google;
begin
initialize(mat);
for i in 0..n loop
for j in 0..m loop
mat(i)(j) := right*left.matrix(i)(j);
end loop;
end loop;
return mat;
end "*";
function "/"(left: T_Google; right: Integer) return T_Google is
n: Positive := left.dim(0);
m: Positive := left.dim(1);
mat: T_Google;
begin
initialize(mat);
for i in 0..n loop
for j in 0..m loop
mat(i)(j) := left.matrix(i)(j)/right;
end loop;
end loop;
return mat;
end "/";
procedure initialize(mat: out T_Google) is
begin
mat.dim(0) := nb_rows;
mat.dim(1) := nb_cols;
for i in 1..rows loop
for j in 1..cols loop
mat.matrix(i)(j) := 0;
end loop;
end loop;
end initialize;
function ones(rows, cols: Positive) return T_Google is
mat: T_Google;
begin
initialize(mat);
for i in 1..rows loop
for j in 1..cols loop
mat(i)(j) := 1;
end loop;
end loop;
end ones;
procedure insert(mat: in out T_Google; i, j: Natural; elm: T_Element) is
begin
mat.matrix(i)(j) := elm;
end insert;
end googleNaive;

39
src/googleNaive.ads
View file

@ -1,39 +0,0 @@
generic
type T_Element is private;
nb_rows, nb_cols: Positive;
package googleNaive is
type T_Row is limited private;
type T_Google is limited private;
function "*"(left, right: T_Google) return T_Google with
Pre => left.dim(1) = right.dim(0),
Post => "*"'Result.dim(0) = left.dim(0)*
and "*"'Result.dim(1) = right.dim(1);
function "+"(left, right: T_Google) return T_Google with
Pre => left.dim = right.dim;
function "*"(left: T_Google; right: T_Element) return T_Google;
function "/"(left: T_Google; right: T_Element) return T_Google with
Pre => right /= 0;
procedure initialize(mat: out T_Google; rows, cols : Positive) with
Post => isEmpty(mat);
function ones(rows, cols: Positive) return T_Google;
procedure insert(mat: in out T_Google; i, j: Natural; elm: T_Element);
function transpose(mat: in T_Google) return T_Google;
private
type T_Row is array (0..nb_cols-1) of T_Element;
type T_Google is record
dim: array (0..1) of Positive;
matrix: array (0..nb_rows-1) of T_Row; -- à voir si on obtient pas l'erreur: anonymous arrays not allowed as components
end googleNaive;

81
src/google_naive.adb Normal file
View file

@ -0,0 +1,81 @@
package body Google_Naive is
function "*"(left, right: T_Google) return T_Google is
mat: T_Google;
Compteur: T_Element := 0.0;
begin
initialize(mat);
for i in 0..left'Length(1) loop
for j in 0..right'Length(2) loop
for k in 0..left'Length(2) loop
Compteur := Compteur + left(i,k) * right(k,j);
end loop;
mat(i,j) := Compteur;
end loop;
end loop;
return mat;
end "*";
function "+"(left, right: T_Google) return T_Google is
mat: T_Google;
begin
initialize(mat);
for i in 0..left'Length(1) loop
for j in 0..left'Length(2) loop
mat(i,j) := left(i,j) + right(i,j);
end loop;
end loop;
return mat;
end "+";
function "*"(left: T_Google; right: T_Element) return T_Google is
mat: T_Google;
begin
initialize(mat);
for i in 0..left'Length(1) loop
for j in 0..left'Length(2) loop
mat(i,j) := right*left(i,j);
end loop;
end loop;
return mat;
end "*";
function "/"(left: T_Google; right: T_Element) return T_Google is
mat: T_Google;
begin
initialize(mat);
for i in 0..left'Length(1) loop
for j in 0..left'Length(2) loop
mat(i,j) := left(i,j)/right;
end loop;
end loop;
return mat;
end "/";
procedure initialize(mat: in out T_Google) is
begin
for i in 1..mat'Length(1) loop
for j in 1..mat'Length(2) loop
mat(i,j) := 0.0;
end loop;
end loop;
end initialize;
function ones(rows, cols: Positive) return T_Google is
mat: T_Google;
begin
initialize(mat);
for i in 1..mat'Length(1) loop
for j in 1..mat'Length(2) loop
mat(i,j) := 1.0;
end loop;
end loop;
return mat;
end ones;
procedure insert(mat: in out T_Google; i, j: Natural; elm: T_Element) is
begin
mat(i,j) := elm;
end insert;
end Google_Naive;

36
src/google_naive.ads Normal file
View file

@ -0,0 +1,36 @@
generic
type T_Element is digits <>;
nb_rows: Positive;
nb_cols: Positive;
package Google_Naive is
type T_Google is limited private;
function "*"(left, right: T_Google) return T_Google with
Pre => left'Length(2) = right'Length(1),
Post => "*"'Result'Length(1) = left'Length(1)
and "*"'Result'Length(2) = right'Length(2);
function "+"(left, right: T_Google) return T_Google with
Pre => left'Length(1) = right'Length(1)
and left'Length(2) = right'Length(2);
function "*"(left: in T_Google; right: T_Element) return T_Google;
function "/"(left: in T_Google; right: T_Element) return T_Google with
Pre => right /= 0.0;
procedure initialize(mat: in out T_Google);
function ones(rows, cols: Positive) return T_Google;
procedure insert(mat: in out T_Google; i, j: Natural; elm: T_Element);
--function transpose(mat: in T_Google) return T_Google;
private
type T_Google is array (0..nb_rows-1, 0..nb_cols-1) of T_Element;
end Google_Naive;

8
src/pageRank.adb
View file

@ -1,8 +1,7 @@
with SDA_Exceptions; use SDA_Exceptions;
with Ada.Text_IO; use Ada.Text_IO;
with Ada.Command_Line; use Ada.Command_Line;
with Ada.Strings.Unbounded; use Ada.Strings.Unbounded;
with googleNaive;
with Google_Naive;
procedure pageRank is
@ -117,11 +116,8 @@ begin
G := G*alpha + ones(N, N)*(1-alpha)/N;
-- on applique l'algorithme itératif
loop
pi_last := pi;
for i in 1..ite_max loop
pi := pi * G;
ite := ite + 1;
exit when (ite >= ite_max) or (pi(1)(1) - pi_last(1)(1) < epsilon); -- changer (1)(1) ?
end loop;
-- write_to_files(filename, ...); -- TODO