diff --git a/src/googleNaive.adb b/src/googleNaive.adb index ec07112..1aa6bed 100644 --- a/src/googleNaive.adb +++ b/src/googleNaive.adb @@ -1,108 +1,91 @@ package body googleNaive is function "*"(left, right: T_Google) return T_Google is - M : T_Google; - n, m, o: Positive; - Compteur : Integer; + mat: T_Google; + n: Positive := left.dim(0); + m: Positive := right.dim(1); + l: Positive := left.dim(1); + Compteur: T_Element := 0; begin - n:=left.dimension(0); - m:=right.dimension(1); - o :=left.dimension(1); - initialize(M,n,m); + initialize(mat); for i in 0..n loop for j in 0..m loop - Compteur:=0; - for l in 0..o loop - Compteur:= Compteur + left.matrix(i,l)*right.matrix(l,j); + for k in 0..l loop + Compteur := Compteur + left.matrix(i)(k)*right.matrix(k)(j); end loop; - M.matrix(i,j):=Compteur; + mat.matrix(i)(j) := Compteur; end loop; end loop; - return M; + return mat; end "*"; function "+"(left, right: T_Google) return T_Google is - n, m : Positive; - M : T_Google; + n: Positive := left.dim(0); + m: Positive := left.dim(1); + mat: T_Google; begin - n := left.dimension(0); - m := left.dimension(1); - initialize(M,n,m); + initialize(mat); for i in 0..n loop for j in 0..m loop - M(i,j):=left.matrix(i,j) + right.matrix(i,j); + mat(i)(j) := left.matrix(i)(j) + right.matrix(i)(j); end loop; end loop; - return M; + return mat; end "+"; function "*"(left: T_Google; right: Integer) return T_Google is - n, m : Positive; - M : T_Google; + n: Positive := left.dim(0); + m: Positive := left.dim(1); + mat: T_Google; begin - n := left.dimension(0); - m := left.dimension(1); - initialize(M,n,m); + initialize(mat); for i in 0..n loop for j in 0..m loop - M(i,j):=right*left.matrix(i,j); + mat(i)(j) := right*left.matrix(i)(j); end loop; end loop; - return M; + return mat; end "*"; function "/"(left: T_Google; right: Integer) return T_Google is - n, m : Positive; - M : T_Google; + n: Positive := left.dim(0); + m: Positive := left.dim(1); + mat: T_Google; begin - n := left.dimension(0); - m := left.dimension(1); - initialize(M,n,m); + initialize(mat); for i in 0..n loop for j in 0..m loop - M(i,j):=left.matrix(i,j)/right; + mat(i)(j) := left.matrix(i)(j)/right; end loop; end loop; - return M; + return mat; end "/"; - function zeros(rows, cols: in Positive) return T_Google is - M : T_Google; + procedure initialize(mat: out T_Google) is begin - initialize(M,rows,cols); - for i in 1..cows loop + mat.dim(0) := nb_rows; + mat.dim(1) := nb_cols; + for i in 1..rows loop for j in 1..cols loop - M(i,j):=0; + mat.matrix(i)(j) := 0; end loop; end loop; - end zeros; + end initialize; - function ones(rows, cols: in Positive) return T_Google is - M : T_Google; + function ones(rows, cols: Positive) return T_Google is + mat: T_Google; begin - initialize(M,rows,cols); - for i in 1..cows loop + initialize(mat); + for i in 1..rows loop for j in 1..cols loop - M(i,j):=1; + 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; + mat.matrix(i)(j) := elm; end insert; - procedure initialize(mat: out T_Google; rows, cols : Positive ) is - - begin - mat.dimension(0):=rows; - mat.dimension(1):=cols; - end initialize; - - - - - - end googleNaive; diff --git a/src/googleNaive.ads b/src/googleNaive.ads index 3b332e6..32b4df2 100644 --- a/src/googleNaive.ads +++ b/src/googleNaive.ads @@ -1,7 +1,7 @@ generic type T_Element is private; - CAPACITY: Positive; + nb_rows, nb_cols: Positive; package googleNaive is @@ -9,21 +9,21 @@ package googleNaive is type T_Google is limited private; function "*"(left, right: T_Google) return T_Google with - Pre => left.dimension(1)=right.dimension(0), - Post => "*"'Result.dimension(0)= left.dimension(0) and "*"'Result.dimension(1)= right.dimension(1); + 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.dimension=right.dimension; + Pre => left.dim = right.dim; - function "*"(left: T_Google; right: Integer) return T_Google; - function "/"(left: T_Google; right: Integer) return T_Google with - Pre => right/=0; + 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 + procedure initialize(mat: out T_Google; rows, cols : Positive) with Post => isEmpty(mat); - function ones(rows, cols: in Positive) return T_Google; - function zeros(rows, cols: in Positive) return T_Google; + function ones(rows, cols: Positive) return T_Google; procedure insert(mat: in out T_Google; i, j: Natural; elm: T_Element); @@ -31,10 +31,9 @@ package googleNaive is private - type T_Row is array (0..CAPACITY-1) of T_Element; + type T_Row is array (0..nb_cols-1) of T_Element; type T_Google is record - dimension: array (0..1) of Positive; - matrix: array (0..CAPACITY-1) of T_Row; - end 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; diff --git a/src/pageRank.adb b/src/pageRank.adb index afe3ca1..4228f28 100644 --- a/src/pageRank.adb +++ b/src/pageRank.adb @@ -5,11 +5,13 @@ with Ada.Strings.Unbounded; use Ada.Strings.Unbounded; with googleNaive; procedure pageRank is + + Type T_Double is digits 6; -- mettre la précision en générique au lieu de T_Element ? ERROR_args: Exception; - procedure getArgs(filename: in out Unbounded_String; - iteMAX: in out Natural; + procedure get_args(filename: in out Unbounded_String; -- remplaçable par un String ? + ite_max: in out Natural; alpha: in out Float; naif: in out Boolean) is i: Natural := 0; @@ -27,7 +29,7 @@ procedure pageRank is alpha := Float'Value(Argument(i+1)); i := i + 2; elsif Argument(i) = "-I" then - iteMAX := Natural'Value(Argument(i+1)); -- verif si les conversions sont bonnes + ite_max := Natural'Value(Argument(i+1)); -- verif si les conversions sont bonnes i := i + 2; elsif Argument(i)(Argument(i)'Last-4 .. Argument(i)'Last) = ".net" then -- verif les indexs filename := To_Unbounded_String(Argument(i)(Argument(i)'First .. Argument(i)'Last-5)); @@ -43,74 +45,84 @@ procedure pageRank is when others => put_line("Erreur lors de la saisi de la commande"); put_line("Usage: pagerank [-I max_iterations] [-A alpha] [-P] fichier_reseau.net"); - end getArgs; + end get_args; - procedure createG_naive(G: in out T_Google) is - File : Ada.Text_IO.File_Type; - N: Natural; - H, S: T_Google; - row, col: Natural; - - function rowSum(row: T_Row) return Natural is - s: Natural := 0; - begin - for r in row loop - s := s + r; - end loop; - return s; - end rowSum; + function row_sum(row: T_Row) return Natural is + s: Natural := 0; begin - open(File, In_File, filename & ".net"); - get(File, N); -- on récupère le nombre de pages - - -- on créé H - while not end_of_File(File) loop - get(File, row); - get(File, col); - insert(H, row, col, 1.0); + for r in row loop + s := s + r; end loop; - - -- on créé S - -- TODO: simplifier tout ça avec l'opérateur "/" sur T_row - for row in H loop - p = rowSum(row); - for j in row loop - if p = 0 then - row(j) := 1/N; - else - if row(j) /= 0 then - row(j) := 1/p; - end if; - end if; - end loop; - end loop; - - G := S*alpha + ones(N, N)*(1-alpha)/N; - - end createG_naive; + return s; + end row_sum; filename: Unbounded_String; - iteMAX: Natural := 150; + ite_max: Natural := 150; naif: Boolean := False; alpha: Float := 0.85; epsilon: Float := 0.01; - pi: T_Google; - G: T_Google; + ite: Natural := 0; + + file: Ada.Text_IO.File_Type; + N: Positive; + pi, pi_last, H, S, G: T_Google; + row, col: Natural; begin - getArgs(filename, alpha, iteMAX, naif); - - initialize(pi, 1, N); - initialize(G, N, N); - createG_naive(G); + get_args(filename, alpha, ite_max, naif); - for i in 1..N loop - pi := pi * G; + open(file, In_File, filename & ".net"); -- verif si la concaténation fonctionne + get(file, N); -- on récupère le nombre de pages + + -- on peut maintenant utiliser le module générique Google_Naive + -- je sais pas si on peut utiliser deux fois le module, à voir + package Matrice is + new Google_Naive(T_Element => T_Double, + nb_rows => N, + nb_cols => N); + use Matrice; + package Vecteur is + new Google_Naive(T_Element => T_Double, + nb_rows => 1, + nb_cols => N); + use Vecteur; + + -- on crée H + while not end_of_File(file) loop + get(file, row); + get(file, col); + insert(H, row, col, 1.0); end loop; - -- write2file(filename, pi); à implémenter + -- on crée S + -- horrible, voir si simplifiable + for row in H loop + p = row_sum(row); + for j in row loop + if p = 0 then + row(j) := 1/N; + else + if row(j) /= 0 then + row(j) := 1/p; + end if; + end if; + end loop; + end loop; + + -- on crée G + G := S*alpha + ones(N, N)*(1-alpha)/N; + + -- on applique l'algorithme itératif + loop + pi_last := pi; + pi := pi * G; + ite := ite + 1; + exit when (ite >= ite_max) or (pi(1)(1) - pi_last(1)(1) < epsilon); + end loop; + + -- write_to_files(filename, ...); -- TODO end pageRank; \ No newline at end of file