From c2a70536bd9ee950c0df7ab44b7067029aeec743 Mon Sep 17 00:00:00 2001
From: PRiNCE BHARDWAj <Prince>
Date: Sat, 28 Mar 2020 02:11:30 +0530
Subject: [PATCH] FSJ0320A021

---
 build/classes/.gitignore                      |   1 +
 build/classes/controller/BusController.class  | Bin 1471 -> 3098 bytes
 .../classes/controller/FlightController.class | Bin 1313 -> 2923 bytes
 .../classes/controller/HotelController.class  | Bin 1315 -> 3103 bytes
 .../classes/controller/TrainController.class  | Bin 1309 -> 2954 bytes
 src/controller/BusController.java             |  11 +-
 src/controller/FlightController.java          |   9 +-
 src/controller/HotelController.java           |   7 +-
 src/controller/TrainController.java           |   9 +-
 src/model/Bus.java                            |  45 ++++++++
 src/model/Flight.java                         |  97 +++++++++++++++++-
 src/model/Hotel.java                          |  59 ++++++++++-
 src/model/Train.java                          |  45 +++++++-
 src/services/Booking.java                     |  10 ++
 src/services/FareCalculator.java              |  63 +++++++++++-
 15 files changed, 340 insertions(+), 16 deletions(-)

diff --git a/build/classes/.gitignore b/build/classes/.gitignore
index 0b6c10d..aa6d612 100644
--- a/build/classes/.gitignore
+++ b/build/classes/.gitignore
@@ -1,3 +1,4 @@
 /controller/
 /model/
 /services/
+/testing/
diff --git a/build/classes/controller/BusController.class b/build/classes/controller/BusController.class
index 59d8dfce65f070de37220d74d77d3703cb9ee8bc..5a749dfa90ef9a075cad53a208eed439dc12107c 100644
GIT binary patch
literal 3098
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

delta 120
zcmbOwv7ejk)W2Q(7#J8#7@Rk9-DBR&%2B}>&tMM}VFqHxjX;8lfgeb+F)#v2e+B^{
zsQ{5=5M&Sn@_@=1%oxnU@{9}?43<D0OboU_aV7>kuu*(KIR_wijAmdgW^e)kUA7Hp

diff --git a/build/classes/controller/FlightController.class b/build/classes/controller/FlightController.class
index 40239610fbc678ebaf66d6731c462039ac68a017..6768faffe3bf870617ff32a2c8dae1d5b03175af 100644
GIT binary patch
literal 2923
zcma)8*;gA?9R6+y%#aKqX=yuEx@Z?5mQlMYskI12V=1(NRO(VE;Q~WLCY_m3+_moe
z?$O8g#Rq-yg;G7o<MC1ZCwbKG&IB3)R9SNG-1*(#@_oN0fBgOPuK*6=8x1jmJM(Ta
z@Z3T{de%U}nVt#yRt_}81$NBZ^Y((}OK-j)18XJ-O4j527>y1D?%*rOE{sdhciiHW
z*?s}>gg_JZ_<>yv#_d8`*3+c=5dsazoT3vP7pUv#92bc9xsx)1Iy4(dASuu?=oIBp
zc`hftF*{d~0;xeaPXjj1@VRmr4`v)+pndQ*0b~T~C*8+nATZJ~c>6#`<fXFogUo-5
z`6UJ>Gs^eG$%VWu1q|EQuyqYq6^K@ZG?)ULlpB`gTG`>17dq|~*k+wO`RIY{(111X
z$jiRv6es0E_pDz^q8&Rm>=4-dzd|su3%dn2Ps^YZRKMew>>xiQJ%Pg!5LUr1PFtga
z=M<+ioi#zPxt2-d9_-byM_}h_AJ&K(*oXZB+LY^Ew!KM#6Sc@!VA%lhmA6$mYhFZ-
z!2TLfYtwOAsetauNP|GF18Xl;Y?0B)DyVkX7+Vu7^Q&RfJ>&X;j{6vMi8a7nP=q~T
z;2;hO7-Zp$?b&lOQ0VX55dBqzBya=|YB(y;8m3D~R<;<(Y3Uhw2tACiWP85knLyim
zO0znSG5zxe+xK;_+~QN7JE!A>KrC=|JjxTYU(&&XZIlZ#Uk;pkR^k92*YFtY`j+J=
zO$=ng!fqfJc7dh0%It7%R_23D=lKK%F{I)2a;68)oV3CM?zaPJU>IlUR_MHdRqc7-
zjO~poqKkQ!SBSl}`gTUc2qB$g$0$^~RRU)*raH%y0;3(-=vH-ZSB`2Ft*d?Q<<4=X
z|D1uRFd@+F%V5YIo;nlJOaMEwk;Kymo>3AyB}N#gudY33-~yhfzdY<yG>pAaVmDg_
z+j0Shc5(*tV8v*>FhH`{6Ds)Bcpn*^GBB;g>nT3wYH$R$vKP-gdFfjNwkP}SLcUzE
z1J_Gn2F>cDU|<eKdY*ILi_ET$!D=uwo&7pWq<AWv1S*f2Za$b}Du~{I36m=a3}SyZ
zag`vd;9JgyaUJt4sz}`wT}og9FKT#UReJTiW%hLgFX3edKd<J+@RS0ozmf$ZpOI8X
z$E)o6HN7%2FwVZI8YX8*F`OS&REaFJJS>JFWFb}MZN-1mrwSr^U+*az6}W-zsTx~1
zV>rZQkrXtqhEWw8gB36bHz0(aBd#oPR<it>Mgu#4@w8nEXPbsk*(g@G*^OEj!5wwW
zUS1A3YErh<j__`!hJK8ciz<i49p53;y~Uy%*x}sbPzfWuHR0`*m)1F%tF&V^Nkd{t
zkQJeg-C+1?reizm(ZE&XQw%y!=@*jxG<b55tKeGSbsbGVg(5BdOi&cqhB&X^!JQEa
zp%p1U#jy#SDbdD#1J^B-RLXKx9_N}$r?%g~T`>$DNZ)${ch}*T=H}3?9caW(YTFfR
z?}~0!wDUeX&>31xp$lnRXyos`I1uXZUe9){m7yt5Z>Ce$4cs5Y5)L0vr!wKbC!S6{
z9PR4UsYjw+Lps$P?KCr<>RZIg?~rV5A3UOe550BMdq;G$ehH^~8qEf^B!0o!iFPyI
zrkjms!ql!~v?pmM+ZQozCfoEyoHvtZd=bxbX<UTOC9w$k3uY#+W46aI4Kuljiw`xW
zQ?8l3flGBrr^?%!mT<Z9@JfhTPm9@7g<2gHA2}inj(G!ni1uFMwvWi{=QqVJ94A73
zL}viqIEDK#g8MN+V(0kQ$6>t4dG!X4;ypZwPtk*KaST`SFn-|8B|L)PaRPs$H$?AR
zgy9MkH&>XrSz*G!Z+H!_lZh=@q~0s!ZWn%}t}9HmE?lFwE6j>RwDTr+8hxw7TfCvu
zyEiJk5qkAD-XW_K^zmKp67=^1O7t?xn}_f|K47$08QX{W2u<`d5oSOOJ`RzH{lkED
o4MIb^hEKQ*to#9gsc*+Id`8h2KF1eao0(8w^8c%+A$)xOFBHY_0{{R3

delta 152
zcmaDYwvbEU)W2Q(7#J8#7);q2m>3zPCtj4^sIARB`5gN}R#65P2Jy*LI6^t488{ha
z7z7z)Cx7Dbh-a_|>R<+9#*ILNiGd$TvN13MNjnAsAgKV61gaMT@_@=1G#E6&@{9~x
g4B9{)Obq%!aV7=>216jt2b41cV&iBA#$pB&0QX-K_W%F@

diff --git a/build/classes/controller/HotelController.class b/build/classes/controller/HotelController.class
index 9738d37c44afeebfb6bb8132bcc489e94f3b93ae..99bcd3a8f17b1e20e6e38e1a4192a99fac545d89 100644
GIT binary patch
literal 3103
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
U;HMl17==IM|C`T4g!uV?05`BEr2qf`

delta 143
zcmbO)v6zeN)W2Q(7#J8#7)&>Ec`;A+<T%PI$-u%OHCdQ5lvAF8lR<$&kU?>BA*V+?
zgFR3oGY~Uw1QJXP{6Lb8fe}c$F$e%j1&Ab2y%3NGRK}pepb3^|WYA*J2I^p9&<Bb$
XF&Hoy0%<;=oDmQkM>8-MGnfDXC#(;k

diff --git a/build/classes/controller/TrainController.class b/build/classes/controller/TrainController.class
index 167c49557346d52c778488cb5592000d897d146d..ed2e12195dd64342d034cfade7a79c70df7790bb 100644
GIT binary patch
literal 2954
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

delta 143
zcmeAYpUcH{>ff$?3=9k=45k~oyqG8NVBgOw#=ycLF}a2#lv9R*lR=h2kU?(pEe?-(
z2791FW*}zV2qc&o_<<xF10#@hXAl6A3J^)4dLbYWsEk2_K@%*`$e_ib4b;KJpbr#h
XVlZGZ1k!v!IU^u8j%HviW-tK&nuQRr

diff --git a/src/controller/BusController.java b/src/controller/BusController.java
index f1f8372..ede66d7 100644
--- a/src/controller/BusController.java
+++ b/src/controller/BusController.java
@@ -1,6 +1,7 @@
 package controller;
 
 import java.io.IOException;
+
 import java.time.LocalDate;
 
 import javax.servlet.RequestDispatcher;
@@ -10,6 +11,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Bus;
+import services.*;
+
 @WebServlet(urlPatterns= {"/bus"})
 public class BusController extends HttpServlet {
 	private static final long serialVersionUID = 1L;
@@ -28,9 +32,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*
 		
-			int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String bustype=request.getParameter("bustype");
 		String date=request.getParameter("start");
 		System.out.println(numberOfPersons);
@@ -58,7 +61,7 @@ else if(bustype.equals("nonacsemisleeper")) {
 		
 		LocalDate start=LocalDate.parse(date);				
 	
-		Bus bus=new Bus(numberOfPersons,rates,bustype,start);
+		Bus bus=new Bus(numberOfPersons,bustype,rates,start);
 		bus.setNoOfPersons(numberOfPersons);
 		bus.setRates(rates);
 		bus.setBusType(bustype);
@@ -72,6 +75,6 @@ else if(bustype.equals("nonacsemisleeper")) {
 		request.setAttribute("busfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/busView.jsp");
 		dispatcher.forward(request, response);
-*/	}
+	}
 	
 }
diff --git a/src/controller/FlightController.java b/src/controller/FlightController.java
index 7760e3c..e182ca8 100644
--- a/src/controller/FlightController.java
+++ b/src/controller/FlightController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Flight;
+import services.FareCalculator;
+
 
 
 @WebServlet("/flight")
@@ -29,7 +32,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String classtype=request.getParameter("class");
 		String from=request.getParameter("from");
 		String to=request.getParameter("to");
@@ -45,7 +48,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		LocalDate start=LocalDate.parse(from);		
 		LocalDate end=LocalDate.parse(to);
 
-		Flight flight=new Flight(numberOfPersons,rates,classtype,start,end,triptype);
+		Flight flight=new Flight(numberOfPersons,classtype,rates,start,end,triptype);
 		flight.setNoOfPersons(numberOfPersons);
 		flight.setRates(rates);
 		flight.setClassType(classtype);
@@ -59,6 +62,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		request.setAttribute("flightfare", rate);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/flightView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/controller/HotelController.java b/src/controller/HotelController.java
index 0c39e3b..67e2e97 100644
--- a/src/controller/HotelController.java
+++ b/src/controller/HotelController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Hotel;
+import services.FareCalculator;
+
 
 
 /*import model.Hotel;
@@ -33,7 +36,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 	}
 
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String roomtype=request.getParameter("roomtype");
 		String occupancy=request.getParameter("occupancy");
 		String from=request.getParameter("from");
@@ -67,6 +70,6 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/hotelOutputView.jsp");
 		dispatcher.forward(request, response);
 	
-*/	}
+	}
 	
 }
diff --git a/src/controller/TrainController.java b/src/controller/TrainController.java
index dcc07df..265a67a 100644
--- a/src/controller/TrainController.java
+++ b/src/controller/TrainController.java
@@ -10,6 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import model.Train;
+import services.FareCalculator;
+
 
 /**
  * Servlet implementation class TrainController
@@ -31,7 +34,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 	
 	protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-/*		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
+		int numberOfPersons=Integer.parseInt(request.getParameter("persons"));
 		String berth=request.getParameter("berth");
 		String date=request.getParameter("to");
 		System.out.println(numberOfPersons);
@@ -55,7 +58,7 @@ else if(berth.equals("nonac")) {
 		}
 		LocalDate start=LocalDate.parse(date);				
 	
-		Train train=new Train(numberOfPersons,rates,berth,start);
+		Train train=new Train(numberOfPersons,berth,rates,start);
 		train.setNoOfPersons(numberOfPersons);
 		train.setRates(rates);
 		train.setBerth(berth);;
@@ -68,6 +71,6 @@ else if(berth.equals("nonac")) {
 		request.setAttribute("trainfare", trainfare);
 		RequestDispatcher dispatcher = request.getRequestDispatcher("/WEB-INF/views/trainView.jsp");
 		dispatcher.forward(request, response);
-	*/}
+	}
 
 }
diff --git a/src/model/Bus.java b/src/model/Bus.java
index 430ca5d..b23cb27 100644
--- a/src/model/Bus.java
+++ b/src/model/Bus.java
@@ -1,3 +1,48 @@
 package model;
 
+import java.time.LocalDate;
+
 // Type your code
+
+public class Bus{
+	private int noOfPersons;
+	private String busType;
+	private int rates;
+	private LocalDate date;
+	
+	
+	//Getter-Setter
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBusType() {
+		return busType;
+	}
+	public void setBusType(String busType) {
+		this.busType = busType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+	//CONSTRUCTOR
+	public Bus(int noOfPersons, String busType, int rates, LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.busType = busType;
+		this.rates = rates;
+		this.date = date;
+	}
+	
+}
\ No newline at end of file
diff --git a/src/model/Flight.java b/src/model/Flight.java
index 9ac54b5..6210b05 100644
--- a/src/model/Flight.java
+++ b/src/model/Flight.java
@@ -1,3 +1,98 @@
 package model;
 
-//Type your code 
\ No newline at end of file
+import java.time.LocalDate;
+
+//Type your code
+
+public class Flight{
+	private int noOfPersons;
+	private String classType;
+	private int rates;
+	private LocalDate from;
+	private LocalDate to;
+	private String triptype;
+	
+	
+	
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+
+
+
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+
+
+
+	public String getClassType() {
+		return classType;
+	}
+
+
+
+	public void setClassType(String classType) {
+		this.classType = classType;
+	}
+
+
+
+	public int getRates() {
+		return rates;
+	}
+
+
+
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+
+
+
+	public LocalDate getFrom() {
+		return from;
+	}
+
+
+
+	public void setFrom(LocalDate from) {
+		this.from = from;
+	}
+
+
+
+	public LocalDate getTo() {
+		return to;
+	}
+
+
+
+	public void setTo(LocalDate to) {
+		this.to = to;
+	}
+
+
+
+	public String getTriptype() {
+		return triptype;
+	}
+
+
+
+	public void setTriptype(String triptype) {
+		this.triptype = triptype;
+	}
+
+
+
+	public Flight(int noOfPersons, String classType, int rates, LocalDate from, LocalDate to, String triptype) {
+		this.noOfPersons = noOfPersons;
+		this.classType = classType;
+		this.rates = rates;
+		this.from = from;
+		this.to = to;
+		this.triptype = triptype;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/model/Hotel.java b/src/model/Hotel.java
index b21180d..4711a73 100644
--- a/src/model/Hotel.java
+++ b/src/model/Hotel.java
@@ -1,2 +1,59 @@
 package model;
-// Type your code
\ No newline at end of file
+// Type your code
+
+import java.time.LocalDate;
+
+public class Hotel{
+	private int noOfPersons;
+	private String roomType;
+	private int rates;
+	private String occupancy;
+	private LocalDate fromdate;
+	private LocalDate todate;
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getRoomType() {
+		return roomType;
+	}
+	public void setRoomType(String roomType) {
+		this.roomType = roomType;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public String getOccupancy() {
+		return occupancy;
+	}
+	public void setOccupancy(String occupancy) {
+		this.occupancy = occupancy;
+	}
+	public LocalDate getFromdate() {
+		return fromdate;
+	}
+	public void setFromdate(LocalDate fromdate) {
+		this.fromdate = fromdate;
+	}
+	public LocalDate getTodate() {
+		return todate;
+	}
+	public void setTodate(LocalDate todate) {
+		this.todate = todate;
+	}
+	
+	public Hotel(int noOfPersons, String roomType, int rates, String occupancy, LocalDate fromdate, LocalDate todate) {
+		this.noOfPersons = noOfPersons;
+		this.roomType = roomType;
+		this.rates = rates;
+		this.occupancy = occupancy;
+		this.fromdate = fromdate;
+		this.todate = todate;
+	}
+		
+}
\ No newline at end of file
diff --git a/src/model/Train.java b/src/model/Train.java
index b21180d..d9b5e41 100644
--- a/src/model/Train.java
+++ b/src/model/Train.java
@@ -1,2 +1,45 @@
 package model;
-// Type your code
\ No newline at end of file
+
+import java.time.LocalDate;
+
+// Type your code
+
+public class Train{
+	private int noOfPersons;
+	private String berth;
+	private int rates;
+	private LocalDate date;
+	
+	public int getNoOfPersons() {
+		return noOfPersons;
+	}
+	public void setNoOfPersons(int noOfPersons) {
+		this.noOfPersons = noOfPersons;
+	}
+	public String getBerth() {
+		return berth;
+	}
+	public void setBerth(String berth) {
+		this.berth = berth;
+	}
+	public int getRates() {
+		return rates;
+	}
+	public void setRates(int rates) {
+		this.rates = rates;
+	}
+	public LocalDate getDate() {
+		return date;
+	}
+	public void setDate(LocalDate date) {
+		this.date = date;
+	}
+	
+	public Train(int noOfPersons, String berth, int rates, LocalDate date) {
+		this.noOfPersons = noOfPersons;
+		this.berth = berth;
+		this.rates = rates;
+		this.date = date;
+	}
+	
+}
\ No newline at end of file
diff --git a/src/services/Booking.java b/src/services/Booking.java
index fe2c822..4f8a98e 100644
--- a/src/services/Booking.java
+++ b/src/services/Booking.java
@@ -1,4 +1,14 @@
 package services;
 
 // Type your code
+/*Create a class called as Booking inside the service package.
+  Create a method public double booking(int noOfPersons,int rates).
+  The booking method should return the total rate.*/
 
+public class Booking{
+	
+	public double booking(int noOfPersons,int rates) {
+		return noOfPersons*rates;
+	}
+	
+}
\ No newline at end of file
diff --git a/src/services/FareCalculator.java b/src/services/FareCalculator.java
index 6d38ab5..d4cbd2f 100644
--- a/src/services/FareCalculator.java
+++ b/src/services/FareCalculator.java
@@ -1,3 +1,64 @@
 package services;
 
-// Type your code
\ No newline at end of file
+import model.*;
+
+// Type your code
+
+/*Create a class called as FareCalculator.
+FareCalculator should extend the Booking Class and should use the booking method defined in Booking Class.
+FareCalculator has 4 methods as mentioned below.
+public double book(Hotel hotel)
+public double book(Flight flight)
+public double book(Train train)
+public double book(Bus bus)
+Each method should return the user details and total fare
+
+
+In the public double book(Hotel hotel)method inside the FareCalculator.
+Check-In date should be less than Check-Out date.
+Single occupancy can be given only for 1 guest.
+If there are 3 guests then the rooms alloted should be 1 Double Occupancy room and 1 Single Occupancy.
+Calculate the total fare after these conditions are met.
+*/
+ public class FareCalculator extends Booking{
+	 
+	 double fare=0;
+	 
+	 public double book(Hotel hotel) {
+		if(hotel.getFromdate().isBefore(hotel.getTodate()))
+		{
+			if(hotel.getNoOfPersons()==1)
+				hotel.setOccupancy("Single");
+			else if(hotel.getNoOfPersons()==3)
+				hotel.setOccupancy("Double "+"Single");
+			fare= hotel.getNoOfPersons()*hotel.getRates();
+		}
+		 return fare;
+	 }
+	 
+	 
+	 public double book(Flight flight) {
+		 if(flight.getTriptype()=="one-way") {
+			 fare=flight.getNoOfPersons()*flight.getRates();
+			 return fare;
+		 }
+		 else if(flight.getTriptype()=="round") {
+			 if(flight.getFrom().isBefore(flight.getTo())) {
+				 fare=flight.getNoOfPersons()*flight.getRates();
+				 return fare;
+			 }
+			 System.out.println("Enter valid date");
+		 }
+		 return fare;
+	 }
+	 
+	 
+	 public double book(Train train) {
+		 return booking(train.getNoOfPersons(),train.getRates());
+	 }
+	 
+	 
+	 public double book(Bus bus) {
+		 return booking(bus.getNoOfPersons(),bus.getRates());
+	 }
+ }
\ No newline at end of file