From 52eb6622ee81c50dd41cfbc8ba53cc210c0e9b1e Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Wed, 5 Jul 2017 21:52:49 +1000 Subject: Simplified Bundle_Containers to use an array instead of a Map --- src/bundles-containers.ads | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/bundles-containers.ads') diff --git a/src/bundles-containers.ads b/src/bundles-containers.ads index c12aa39..1982693 100644 --- a/src/bundles-containers.ads +++ b/src/bundles-containers.ads @@ -2,11 +2,11 @@ with - Ada.Containers.Ordered_Maps, Ada.Containers.Vectors; generic + type Candidate_Range is range <>; package Bundles.Containers is @@ -15,19 +15,15 @@ package Bundles.Containers is Element_Type => Bundle); - package Bundle_Maps is new Ada.Containers.Ordered_Maps - (Key_Type => Candidates.CandidateID, - Element_Type => Bundle_Vectors.Vector, - "<" => Candidates."<", - "=" => Bundle_Vectors."="); + subtype Bundle_Vector is Bundle_Vectors.Vector; - subtype Bundle_Map is Bundle_Maps.Map; + type Bundle_Collection is array (Candidate_Range) of Bundle_Vector; procedure Read_Bundles (Filename : in String; - Result : out Bundle_Map); + Result : out Bundle_Collection); end Bundles.Containers; -- cgit