zadt 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86e5ca0fd050ff281f0ca0a6bb5cc7c00b280853
-  data.tar.gz: 888f8e20e307fdc2ee0a8cffc007428fd712fa23
+  metadata.gz: a5c19deae423e0c9c58bd1a0ca3426f9f5c35247
+  data.tar.gz: 90eccd3bfea079e453115d2f37adc811050281f6
 SHA512:
-  metadata.gz: 5a341716b85e4e6cb204045d087b5b23254e0dba1c5abd587ce8ab82f9d6c30205b04175e620a6bc8600b3d5003f885ef6e01db38d4815a085b859376bd85d08
-  data.tar.gz: 1a45efbc759a7b21bd9807c1c6bff9e7d89c8cc243dbea25d080d6047a32e19277b56fa37177a966f78e196e1b4e66cb2c5f0b1d7790c9a0b88703151f3065b0
+  metadata.gz: 06af58c05476e6e9b876aa73db9d966ec36dd28a417aff76f5dede74648627eed9a28afae75de7f874aad8efa7ac592cf821959bf35e407dfeb6ba8e4af08160
+  data.tar.gz: 3a3ec25e47c7c5c5c031ff03d5275b5959450fedee8176e6ea99be9b87fa2bcb91f9174078d3b0cd9401fd80ccbd55dd9fd8fdb610be4ad9110432d71e68d3e9

data/lib/zadt/AbstractDataTypes/ADT.rb

@@ -14,7 +14,7 @@ module Zadt
       puts "--Vertex, a 'spot' on the graph"
       puts "--Edge, connects two vertices"
       puts "-FaceGraph, a sub-class of Graph which includes Faces"
-      puts "--Face, a space surrounded by Edges.  Consists of Vertices and the Edges connecting them"
+      puts "--Face, a space surrounded by a cycle of Edges.  Consists of Vertices and the Edges connecting them"
       puts ""
       puts "Each data type also has a help function.  Type Zadt::Stack::help or Zadt::Stack::methods for a list of Stack methods, and so on for each data type."
     end

data/lib/zadt/AbstractDataTypes/Graph/edge.rb

@@ -1,19 +1,23 @@
 module Zadt
   class Edge
-    attr_accessor :connection
-    def initialize(v1, v2)
+    # Made up of a
+    attr_reader :connection
+    # Contains
+    attr_accessor :value
+    def initialize(v1, v2, value = Hash.new)
       @connection = [v1, v2]
-    end
-    
-    def self.help
-      puts "Edge has one method:"
-      puts "#connection, which returns the vertices the edge connects"
+      @value = value
     end
 
     def self.methods
       self.help
     end
 
+
+    def inspect
+      @connection.to_s
+    end
+
     def help
       self.help
     end
@@ -22,8 +26,12 @@ module Zadt
       help
     end
 
-    def inspect
-      @connection.to_s
+    def self.help
+      puts "Edge has one method:"
+      puts "#connection, which returns the vertices the edge connects"
     end
+
+    private
+
   end
 end

data/lib/zadt/AbstractDataTypes/Graph/face.rb

@@ -3,17 +3,22 @@
 module Zadt
   class Face
     attr_reader :edges, :vertices, :neighboring_faces
-    def initialize(edges_array, neighboring_faces = {})
+    # Contains
+    attr_accessor :value
+    def initialize(edges_array, neighboring_faces = {}, value = Hash.new)
       raise "Not enough edges" if edges_array.length < 3
       @edges = edges_array
       vertices = edges_array.map{ |edge| edge.connection}.inject(:+).uniq
       @vertices = ensure_cyclic(vertices)
       @neighboring_faces = neighboring_faces
       @neighbor_id = @neighboring_faces.length
+      @value = value
     end
 
+    # TODO: Neighbors shouldn't be stored in Face, as FaceGraph takes care of this
     def self.help
       puts "Here are the functions for Face:"
+
       puts "#add_neighbor(face)"
       puts "#remove_neighbor(neighbor)"
     end

data/lib/zadt/AbstractDataTypes/Graph/face_graph.rb

@@ -3,7 +3,12 @@ require_relative 'graph.rb'
 
 module Zadt
   class FaceGraph < Graph
+    # Made up of
     attr_reader :faces
+    #   in addition to its parent's :vertices and :edges
+
+    # Contains
+    # attr_accessor :value
 
     def initialize
       #@faces is ALL faces on the graph
@@ -11,37 +16,10 @@ module Zadt
       super
     end
 
-    def self.help
-      puts "Here are the functions for FaceGraph:"
-      puts "#add_face(edges_array), makes a face with the given edges (must be cyclicly connected)"
-      puts "#make_original_face(num_edges), which makes a standard disconnected face"
-      puts "#add_attached_face(vertex_array, num_edges), which adds a face connected to the vertex_array"
-      puts "#find_neighbors(vertex_array), lists all faces containing the given vertices"
-      puts "#find_face_neighbors(vertex_array), which finds all neighbors of the given face"
-      puts "--a neighbor of a face is defined as one that shares a vertex (not necessarily an edge)"
-      puts "#make_vertex_line(vertex_array), reorders a list of connected vertices by connection sequence"
-      puts ""
-      puts "FaceGraph also inherits the following functions from Graph:"
-      puts "#add_vertex"
-      puts "#remove_vertex(vertex)"
-      puts "#make_connection(v1,v2), adds an edge between two vertices"
-      puts "#break_connection(v1,v2)"
-      puts "#find_connection(v1,v2), returns edge connecting two given vertices"
-      puts "#is_connected?(v1,v2)"
-    end
-
     def self.methods
       self.help
     end
 
-    def help
-      self.help
-    end
-
-    def methods
-      help
-    end
-
     def add_face(edges_array)
       face = Face.new(edges_array)
       @faces << face
@@ -142,6 +120,37 @@ module Zadt
       neighbors - [face]
     end
 
+    def help
+      FaceGraph.help
+    end
+
+    def methods
+      help
+    end
+
+
+
+    def self.help
+      puts "Here are the functions for FaceGraph:"
+      puts "#add_face(edges_array), makes a face with the given edges (must be cyclicly connected)"
+      puts "#make_original_face(num_edges), which makes a standard disconnected face"
+      puts "#add_attached_face(vertex_array, num_edges), which adds a face connected to the vertex_array"
+      puts "#find_neighbors(vertex_array), lists all faces containing the given vertices"
+      puts "#find_face_neighbors(vertex_array), which finds all neighbors of the given face"
+      puts "--a neighbor of a face is defined as one that shares a vertex (not necessarily an edge)"
+      puts "#make_vertex_line(vertex_array), reorders a list of connected vertices by connection sequence"
+      puts ""
+      puts "FaceGraph also inherits the following functions from Graph:"
+      puts "#add_vertex"
+      puts "#remove_vertex(vertex)"
+      puts "#make_connection(v1,v2), adds an edge between two vertices"
+      puts "#break_connection(v1,v2)"
+      puts "#find_connection(v1,v2), returns edge connecting two given vertices"
+      puts "#is_connected?(v1,v2)"
+    end
+
+  private
+
     def make_vertex_line(vertex_array)
       connection_line = []
       connection_line << vertex_array.first
@@ -158,7 +167,7 @@ module Zadt
       end
       connection_line
     end
-    private
+
     def make_neighbors(face1, face2)
       face1.add_neighbor(face2)
       face2.add_neighbor(face1)

data/lib/zadt/AbstractDataTypes/Graph/graph.rb

@@ -1,8 +1,15 @@
 require_relative 'vertex.rb'
-
+require_relative 'edge.rb'
 module Zadt
   class Graph
-    attr_reader :vertices, :edges
+    # Made up of
+    attr_reader :vertices
+
+    # Which are connected by
+    attr_reader :edges
+
+    # Contains
+    attr_accessor :value
 
     #init_v allows for initial vertices (not generally used)
     def initialize
@@ -10,30 +17,13 @@ module Zadt
       @vertices = []
       #@edges is ALL edges on the graph
       @edges = []
-    end
-
-    def self.help
-      puts "Here are the functions for Graph:"
-      puts "#add_vertex"
-      puts "#remove_vertex(vertex)"
-      puts "#make_connection(v1,v2), adds an edge between two vertices"
-      puts "#break_connection(v1,v2)"
-      puts "#find_connection(v1,v2), returns edge connecting two given vertices"
-      puts "#is_connected?(v1,v2)"
+      @value = Hash.new
     end
 
     def self.methods
       self.help
     end
 
-    def help
-      self.help
-    end
-
-    def methods
-      help
-    end
-
     # Add a vertex
     def add_vertex
       vertex = Vertex.new
@@ -59,12 +49,24 @@ module Zadt
     def make_connection(v1, v2)
       raise "already connected" if is_connected?(v1, v2)
       # Connect the two using the vertex method "connect"
+
       edge = v1.connect(v2)
       # Add to edge catalog
       @edges << edge
       edge
     end
 
+    # Find the edge connecting two vertices
+    def find_connection(v1, v2)
+      connection = v1.edges.select {|edge| edge.connection.include?(v2)}
+      connection.first
+    end
+
+    # Returns whether two vertices are connected
+    def is_connected?(v1, v2)
+      v1.connections.include?(v2)
+    end
+
     def break_connection(v1, v2)
       raise "First vertex does not exist" if !v1
       raise "Second vertex does not exist" if !v2
@@ -84,15 +86,22 @@ module Zadt
       end
     end
 
-    # Find the edge connecting two vertices
-    def find_connection(v1, v2)
-      connection = v1.edges.select {|edge| edge.connection.include?(v2)}
-      connection.first
+    def help
+      Graph.help
     end
 
-    # Returns whether two vertices are connected
-    def is_connected?(v1, v2)
-      v1.connections.include?(v2)
+    def methods
+      help
+    end
+
+    def self.help
+      puts "Here are the functions for Graph:"
+      puts "#add_vertex"
+      puts "#remove_vertex(vertex)"
+      puts "#make_connection(v1,v2), adds an edge between two vertices"
+      puts "#break_connection(v1,v2)"
+      puts "#find_connection(v1,v2), returns edge connecting two given vertices"
+      puts "#is_connected?(v1,v2)"
     end
   end
 end

data/lib/zadt/AbstractDataTypes/Graph/vertex.rb

@@ -1,39 +1,29 @@
-require_relative 'edge.rb'
 module Zadt
   class Vertex
-    attr_accessor :edges, :connections
-    def initialize
+    # Connected by
+    attr_accessor :edges
+
+    # Connected with
+    attr_accessor :connections
+
+    # Contains
+    attr_accessor :value
+
+    def initialize(value = Hash.new)
       # List of edges attached to vertex
       @edges = []
       # List of vertices "connected" to this one
       @connections = []
-    end
-
-    def self.help
-      puts "Here are the functions for Vertex:"
-      puts "#connect(other_vertex)"
-      puts "#is_connected?(other_vertex)"
-      puts "#make_connection(v1,v2)"
-      puts "#break_connection(v1,v2)"
-      puts "#find_connection(v1,v2)"
-      puts "#is_connected?(v1,v2)"
+      @value = value
     end
 
     def self.methods
       self.help
     end
 
-    def help
-      self.help
-    end
-
-    def methods
-      help
-    end
-
     # Make an edge between this vertex and another
     def connect(other_vertex)
-      return nil if !other_vertex
+      return nil if !other_vertex.is_a?(Vertex) || other_vertex == self
       raise "already connected" if is_connected?(other_vertex)
 
       edge = Edge.new(self, other_vertex)
@@ -51,7 +41,8 @@ module Zadt
     end
 
     def inspect
-      "Vertex"
+      description = "Vertex"
+      description += ": empty" if @value.empty?
     end
 
     # Used to store connection info in the second vertex
@@ -62,5 +53,23 @@ module Zadt
       @connections << vertex
     end
 
+    def self.help
+      puts "Here are the functions for Vertex:"
+      puts "#connect(other_vertex)"
+      puts "#is_connected?(other_vertex)"
+      puts "#make_connection(v1,v2)"
+      puts "#break_connection(v1,v2)"
+      puts "#find_connection(v1,v2)"
+      puts "#is_connected?(v1,v2)"
+    end
+
+    def help
+      Vertex.methods
+    end
+
+    def methods
+      help
+    end
+    private
   end
 end

data/lib/zadt/version.rb

@@ -1,3 +1,3 @@
 module Zadt
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zadt
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Benjamin Zagorski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler