ipxact-ruby 0.12.0 → 0.12.1

data/VERSION

@@ -1 +1 @@
-0.12.0
+0.12.1

data/lib/ipxact/component.rb

@@ -38,6 +38,9 @@ class IPXACT::Component < Hash
   
   # @return [Array<Hash>] the list of ports
   attr_accessor :ports
+
+  # @return [Array<Hash>] the list of cpus
+  attr_accessor :cpus
   
   # Creates a new {IPXACT::Component} instance
   #
@@ -59,6 +62,14 @@ class IPXACT::Component < Hash
                  :name => name})
   end
 
+  # Returns true if the component has one or more cpus
+  #
+  # @return [Boolean]
+  #
+  def has_cpu?
+    !(self.cpus.nil? || self.cpus.empty?)
+  end
+
   # Calculates an optimal path in the subcomponent graph between
   # +subcomponent_start+ and +subcomponent_end+. This computation takes into
   # account hierarchical subcomponents, and identifies optimal sub-paths in
@@ -186,6 +197,23 @@ class IPXACT::Component < Hash
     end
   end
 
+  # Commodity method for recursively getting all the subcomponents of the
+  # current component (except complex components, i.e. components that
+  # themselves have subcomponents).
+  #
+  # @return [Array<Component>] the current component's subcomponents
+  #
+  def rec_get_subcomponents(current_list = [])
+    subcomponents.each do |s|
+      if s[1].subcomponents.empty?
+        current_list << s
+      else
+        s[1].rec_get_subcomponents(current_list)
+      end
+    end
+    current_list
+  end
+
   # Prepares the connection structure for the {IPXACT::GraphPathFinder} class.
   # Traverses the hierarchy of subcomponents in order to create a flattened
   # representation of the subcomponents graph. In particular, the method

data/lib/ipxact/parser/component_data_parser.rb

@@ -82,11 +82,16 @@ module IPXACT::Parser::ComponentData
       IPXACT::Parser::BusData.parse_bus(a_bus_interface, root_component, variables)
     end
 
+    cpus = root_component.xpath(".//spirit:cpu").collect do |a_cpu|
+      { :name => a_cpu.xpath("./spirit:name").first.text }
+    end
+
     component = IPXACT::Component.new(instance_name, component_name, component_vendor, component_version)
     component.interconnections = interconnections
     component.hierconnections = hierconnections
     component.subcomponents = instances
     component.ports = ports
+    component.cpus = cpus
     component
   end
 

data/spec/unit/component_spec.rb

@@ -149,4 +149,51 @@ describe IPXACT::Component do
     (dma[:name] + '/' + dma[:vendor] + '/x/y').should == 'dma/spiritconsortium.org/x/y'
     
   end
+
+  it "should be able to detect that a dma has no cpu" do
+    components = IPXACT::load_components(PLATFORM_PATH)
+    designs = IPXACT::load_designs(PLATFORM_PATH)
+    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
+
+    dma = platform.components['i_dma']
+    dma.should_not have_cpu
+  end
+
+  it "should be able to detect that a Leon2 processor is in fact a cpu" do
+    components = IPXACT::load_components(PLATFORM_PATH)
+    designs = IPXACT::load_designs(PLATFORM_PATH)
+    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
+
+    leon2 = platform.components['i_proc']
+    leon2.should have_cpu
+    leon2.cpus.should have(1).cpu
+    leon2.cpus.first[:name].should == "processor"
+  end
+
+  it "should return an empty list getting the recursive list of dma subcomponents" do
+    components = IPXACT::load_components(PLATFORM_PATH)
+    designs = IPXACT::load_designs(PLATFORM_PATH)
+    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
+
+    dma = platform.components['i_dma']
+    dma.rec_get_subcomponents.should be_empty
+  end
+
+  it "should return an array with 4 elements when considering the recursive list of the apb subsystem subcomponents" do
+    components = IPXACT::load_components(PLATFORM_PATH)
+    designs = IPXACT::load_designs(PLATFORM_PATH)
+    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
+
+    sub = platform.components['i_sub']
+    sub.rec_get_subcomponents.size.should == 4
+  end
+
+  it "should return an array with 10 elements when considering the recursive list of the platform components" do
+    components = IPXACT::load_components(PLATFORM_PATH)
+    designs = IPXACT::load_designs(PLATFORM_PATH)
+    platform = IPXACT::Parser::PlatformData.parse_platform(["Leon2Platform", "1.1"], components, designs)
+
+    platform.rec_get_subcomponents.size.should == 10
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 12
-  - 0
-  version: 0.12.0
+  - 1
+  version: 0.12.1
 platform: ruby
 authors: 
 - Guillaume Godet-Bar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-13 00:00:00 +01:00
+date: 2010-12-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency