Fleet.drawio.html

@@ -0,0 +1,12 @@
+<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=5,IE=9" ><![endif]-->
+<!DOCTYPE html>
+<html>
+<head>
+<title>Fleet.drawio.html</title>
+<meta charset="utf-8"/>
+</head>
+<body>
+<div class="mxgraph" style="max-width:100%;border:1px solid transparent;" data-mxgraph="{&quot;highlight&quot;:&quot;#0000ff&quot;,&quot;nav&quot;:true,&quot;resize&quot;:true,&quot;xml&quot;:&quot;&lt;mxfile host=\&quot;Electron\&quot; modified=\&quot;2022-07-19T18:53:35.103Z\&quot; agent=\&quot;5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/19.0.3 Chrome/102.0.5005.63 Electron/19.0.3 Safari/537.36\&quot; etag=\&quot;Aq1AchRokJDHtKoxO1RO\&quot; version=\&quot;19.0.3\&quot; type=\&quot;device\&quot;&gt;&lt;diagram id=\&quot;bYEdDUY9EFOD96TcEZc_\&quot; name=\&quot;Page-1\&quot;&gt;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&lt;/diagram&gt;&lt;/mxfile&gt;&quot;,&quot;toolbar&quot;:&quot;pages zoom layers lightbox&quot;,&quot;page&quot;:0}"></div>
+<script type="text/javascript" src="https://app.diagrams.net/js/viewer-static.min.js"></script>
+</body>
+</html>

fleet.py

@@ -1,69 +1,87 @@
 from abc import ABC, abstractmethod
+import random
+import enum
 # ABC is imported from the standard library since Python does not natively support abstract methods and classes.
 class Fleet():
     
     fleet_members = []
-    
+         
-    def __init__(self, vtype, movspeed, travelmed, vehicleid):
-        self.vehicletype = vtype
-        self.movementspeed = movspeed
-        self.travelmedium = travelmed
-        self.uuid = vehicleid
-            
-            
     def displayAllFleetMembers(self):
-        for i in self.vehicles:
+        for i in self.fleet_members:
-            print(i)
+            print(str(i))
-            
-    def displayVehicleType(self):
-        print(self.vehicletype)
         
     def addVehicle(self, newVehicleId):
         self.fleet_members.append(newVehicleId)
     
-
-  
-  
-
-        
 class Vehicle(ABC):
     '''Defines the properties of vehicles'''
+    # _fuelType = ("Diesel", "Gasoline", "Aviation Gas", "Electricity", "Nuclear", "100LL")
     
     # https://www.geeksforgeeks.org/inheritance-and-composition-in-python/
+    
+    def __str__(self):
+        return str(self.vehicleType)
     @abstractmethod
-    def __init__(self, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid):
+       
-        self.vehicleObject = Fleet(vtype,movspeed, travelmed, vehicleid)
+    def __init__(self, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType, _vehicleType):
         self.gpsPosition = _gpsPosition
         self.velocity = _velocity
-        self.velocityType = _weight
+        self.velocityType = _velocityType
-        self.weightType = _velocityType
+        self.weight = _weight
-        self.weight = _weightType
+        self.weightType = _weightType
         self.status = _status
+        self.fuelType = _fuelType
+        self.vehicleType = _vehicleType
+    
+    def loadCargo(self, _weight):
+        self.status = "loading cargo"
+        print(self.status)
         
+class fuelTypes(enum.Enum):
+    Diesel = 1
+    Gasoline = 2
+    Aviation_Kerosene = 3
+    Electricity = 4
+    Nuclear = 5
+    Aviation_Gas = 6
+class VehicleTypes(enum.Enum):
+# This enum exists to provide easy access to the user creating a new object type
+    semi_Truck = 1
+    train = 2
+    truck = 3
+    van = 4
+    car = 5
+    hovercraft = 6
+    barge = 7
+    ship = 8
+    airplane = 9
+    helicopter = 10
+    
 class GroundVehicleInterface(ABC):
     '''Resource on Python interfaces. This is duck typed. https://realpython.com/python-interface/ Interfaces make a contract that a method must be implemented if an interface is inherited and allows differing implementations of the same method.'''
     @abstractmethod
     def travel(self):
         pass
         
-class GroundVehicle(Vehicle, GroundVehicleInterface):
+class GroundVehicle(Vehicle):
 
     @abstractmethod
-    def __init__(self, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid):
+    def __init__(self, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status,vehicleid, _fuelType, _vehicleType):
-        super().__init__(_gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid)
+        super().__init__(_gpsPosition, _velocity, _weight, _velocityType, _weightType, _status,vehicleid, _fuelType, _vehicleType)
         self.isModular = _isModular
-        # modifier to GPS position
         self.moveGroundVehicle = _moveGroundVehicle
-        
+        # modifier to GPS position
 class RoadVehicle(GroundVehicle):
     
     @abstractmethod
-    def __init__(self, _axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid):
+    def __init__(self, _axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType, _vehicleType):
-        super().__init__(_isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid)
+        super().__init__(_isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType, _vehicleType)
         self.axleCount = _axlecount
     
-class Train(GroundVehicle):
+    # Put class specific variables at the end of the constructor/super call
-    def __init__(self, _noOfCarsAttached, _locomotiveCount):
+class Train(GroundVehicle, GroundVehicleInterface):
+    def __init__(self, _noOfCarsAttached, _locomotiveCount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType):
+        super().__init__(_isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType, VehicleTypes.train)
         self.noOfCarsAttached = _noOfCarsAttached
         self.locomotiveCount = _locomotiveCount
         
@@ -73,32 +91,94 @@ class Train(GroundVehicle):
         print(f"The train has {self.locomotiveCount} locomotives attached.")
     def travel(self):
         print("Speed 60mph, Direction E")
+    def loadCargo(self, _weight, _noOfCarsAttached):
+            super().loadCargo(_weight)
+            self.weight = _weight + input(f"Enter cargo weight (integer values only).")
+            try:
+                weight = int(weight)
+            except ValueError:
+                self.weight = _weight + input(f"That entry was not an integer. Enter cargo weight in integers only.")
         
-Train1 = Train(20, 2)
+        
+   # Pattern used for loadCargo - https://stackoverflow.com/questions/38987072/how-to-force-integer-input-in-python-3-x     
+        
+# Train1 = Train(20, 2)
 
-Train1.displayCarCount()
+# Train1.displayCarCount()
-Train1.displayLocomotiveCount()
+# Train1.displayLocomotiveCount()
 
 # At this point, my code should print out the values from the car count and the locomotive count. Further demonstration of abstract and concrete classes to follow.
 
 # Always encapsulate parent constructors into child classes to make those variables available
-class semi_Truck(RoadVehicle):
+class semi_Truck(RoadVehicle, GroundVehicleInterface):
-    def __init__(self, _noOfTrailersAttached, _axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid):
+    def __init__(self, _noOfTrailersAttached, _axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType):
         self.noOfTrailersAttached = _noOfTrailersAttached
         # super in Python returns an object representing the parent class and 
-        super().__init__(_axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vtype,movspeed, travelmed, vehicleid)
+        super().__init__(_axlecount, _isModular, _moveGroundVehicle, _gpsPosition, _velocity, _weight, _velocityType, _weightType, _status, vehicleid, _fuelType, VehicleTypes.semi_Truck)
         # Don't modify passed in values unless absolutely necessary
     def displaySemiAttributes(self):
         print(f"The semi has {self.noOfTrailersAttached} trailers attached", f"and {self.axleCount} axles.")
     def travel(self):
         print(self.status)
-        
+    def loadCargo(self, _weight):
+        super().loadCargo(_weight)
+        # How do I access the set value in the init above?
+        try:
+            self.weight = _weight + int(input(f"Enter cargo weight (integer values only)."))
+            print(f"The semi truck is {self.status}.", f"Cargo weight is {self.weight}.")
+        except ValueError:
+            self.weight = _weight + int(input(f"That entry was not an integer. Enter cargo weight in integers only."))
+            print(f"The semi truck is {self.status}.", f"Cargo weight is {self.weight}.")
+
+# https://realpython.com/factory-method-python/
+# Factory method patterns, both standard and polymorphic - https://python-3-patterns-idioms-test.readthedocs.io/en/latest/Factory.html#preventing-direct-creation
+class VehicleFactory():
+    def factory(self, _type):
+        # try:
+                if _type == VehicleTypes.semi_Truck:
+                
+                    truckToBuild = semi_Truck(2, 4, True, [40.0000, 50.0000], [30.0000, 20.000], 60, 90000, "mph", "lbs", "traveling", "307UNHL", fuelTypes.Diesel)
+                    return truckToBuild
+                # Make these parameters and not hard coded values
+                elif _type == VehicleTypes.train:
+                    return Train(4, 5, True, [40.0000, 50.0000], [30.0000, 20.000], 60, 90000, "mph", "lbs", "traveling", "307UNHL", fuelTypes.Diesel )
+                else:
+                    print("Bad vehicle creation: " + str(type))
+        # except TypeError:
+        #     print("Unexpected object creation error")
+            
+ShippingFleet = Fleet()
+
+factory1 = VehicleFactory()
+
+SemiTruck1 = factory1.factory(VehicleTypes.semi_Truck)
+
+# print(SemiTruck1)
+
+Train1 = factory1.factory(VehicleTypes.train)
+
+ShippingFleet.addVehicle(Train1)
+
+ShippingFleet.addVehicle(SemiTruck1)
+
+# ShippingFleet.displayAllFleetMembers()
+
+ShippingFleet.displayAllFleetMembers()
+
+
+
+    
+# Create object first before asking for input. Then insert object
+    
  
-STruck = semi_Truck(2, 4, True, [40.0000, 40.0000], [56.0000, 89.0000], 60, 90000, "mph", "lbs,", "Ready", "Semi Truck", 100, "Ground", "1F8HNG7")       
+# STruck = semi_Truck(2, 4, True, [40.0000, 40.0000], [56.0000, 89.0000], 60, 90000, "mph", "lbs,", "Ready", "1F8HNG7", "diesel")       
 
 # When possible, build your argument requirements from the top down so that by the time you implement your concrete classes, you know all the data points that you need to include.
 # Remember to be careful to check that you are running the method on an instance of the class, not on the class definition.
-STruck.displaySemiAttributes()
+# STruck.displaySemiAttributes()
+
+# STruck.loadCargo(90000)
+
 
 
 # Next - implement abstracted methods and constructor classes. Demonstrate use of super if Python supports it.
@@ -106,22 +186,45 @@ STruck.displaySemiAttributes()
 # Make vehicle objects, add them to the fleet, and then have displayAllVehicles show the newly added vehicle. Stretch/further off, have different types of vehicles travel regardless of type.
 
 ''' 
-Code scratchpad
+    Code scratchpad
 
-For the travel method implemented from the interface
+    For the travel method implemented from the interface
 
-Vehicle.velocity = self.moveGroundVehicle
+    Vehicle.velocity = self.moveGroundVehicle
-        print("Traveling")
+            print("Traveling")
+            
+    Object implementation
+
+    Semi_Truck1 = semi_Truck(f"This truck has {2} trailers attached", f"and {4} axles.", True, [49.8900000, 50.900000])
+
+    # vehicle1 = Fleet("car", 120, "ground", Fleet.vehicles[0])
+    
+    # vehicle1.displayAllFleetMembers()
+
+    # addVehicle = Fleet("hovercraft", 50, "ground/water", 0)
+
+    # vehicle1.displayAllFleetMembers()
+
+    Error message
+        Enter cargo weight (integer values only).70000
+    Traceback (most recent call last):
+    File "/Users/jason.ross/workspace/python_oop_practice/vehicle_oop_example/fleet.py", line 126, in <module>
+        STruck.loadCargo(90000)
+    File "/Users/jason.ross/workspace/python_oop_practice/vehicle_oop_example/fleet.py", line 113, in loadCargo
+        self.weight = _weight + input(f"Enter cargo weight (integer values only).")
+    TypeError: unsupported operand type(s) for +: 'int' and 'str'
+
+
+    Scrapped factory class
+
+    def inputFunc(self, user_input, listVehicleTypes):
+            def _listVtypes():
+                listVehicleTypes = print(map(VehicleTypes))
+                return listVehicleTypes
+            user_input = [input("Enter vehicle weight"), ]
+            return listVehicleTypes, user_input
         
-Object implementation
+        def serialize(self, user_input, inputFunc):
-
+            serializer = inputFunc(user_input, VehicleTypes)
-Semi_Truck1 = semi_Truck(f"This truck has {2} trailers attached", f"and {4} axles.", True, [49.8900000, 50.900000])
+            return serializer(user_input)
-
+    '''
-# vehicle1 = Fleet("car", 120, "ground", Fleet.vehicles[0])
-  
-# vehicle1.displayAllFleetMembers()
-
-# addVehicle = Fleet("hovercraft", 50, "ground/water", 0)
-
-# vehicle1.displayAllFleetMembers()
-'''