Merge lp:~jan-ellenbeck/openwns-library/libwns-forIMTAphy into lp:openwns-library

[Jan]

Added necessary interface for to-be released IMTAphy module. Note that the interface is still preliminary and is about to change once integration with LTE layer 2 progresses.

Also added a operator< method to wns::geometry::Point (which is aliased to wns::Position) that allows its use as a key in a std::map.

[Maciej Muehleisen (mue-comnets)]

review: Approve

=== modified file 'config/libfiles.py'
--- config/libfiles.py	2010-09-22 19:11:27 +0000
+++ config/libfiles.py	2010-12-15 19:20:10 +0000
@@ -947,6 +947,12 @@
 'src/service/phy/ofdma/Measurements.hpp',
 'src/service/phy/ofdma/Notification.hpp',
 'src/service/phy/ofdma/Pattern.hpp',
+
+'src/service/phy/imta/ChannelStateInfo.hpp',
+'src/service/phy/imta/DataReception.hpp',
+'src/service/phy/imta/DataTransmission.hpp',
+'src/service/phy/imta/IMTAphyObserver.hpp',
+
 'src/service/phy/phymode/MI2PERInterface.hpp',
 'src/service/phy/phymode/PhyModeInterface.hpp',
 'src/service/phy/phymode/PhyModeMapperInterface.hpp',
 
=== modified file 'src/geometry/Point.cpp'
--- src/geometry/Point.cpp	2009-01-10 23:22:05 +0000
+++ src/geometry/Point.cpp	2010-12-15 19:20:10 +0000
@@ -27,6 +27,7 @@
 
 #include <WNS/Position.hpp>
 #include <stdexcept>
+#include <tr1/tuple>
 
 using namespace std;
 using namespace wns::geometry;
@@ -193,4 +194,10 @@
 	return str;
 }
 
+bool
+Point::operator<(const Point& other) const
+{
+    using std::tr1::tie;
+    return tie(get()[0], get()[1], get()[2]) < tie(other.get()[0], other.get()[1], other.get()[2]);
+}
 
 
=== modified file 'src/geometry/Point.hpp'
--- src/geometry/Point.hpp	2009-01-10 23:22:05 +0000
+++ src/geometry/Point.hpp	2010-12-15 19:20:10 +0000
@@ -105,6 +105,8 @@
 
 		bool
 		operator!=(const Point& other) const;
+        
+        bool operator<(const Point& other) const;
 
 		friend std::ostream&
 		operator<<(std::ostream& str, const Point& point)
 
=== added directory 'src/service/phy/imta'
=== added file 'src/service/phy/imta/ChannelStateInfo.hpp'
--- src/service/phy/imta/ChannelStateInfo.hpp	1970-01-01 00:00:00 +0000
+++ src/service/phy/imta/ChannelStateInfo.hpp	2010-12-15 19:20:10 +0000
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * This file is part of IMTAphy / openWNS
+ * _____________________________________________________________________________
+ *
+ * Copyright (C) 2010
+ * Institute of Communication Networks (LKN)
+ * Department of Electrical Engineering and Information Technology (EE & IT)
+ * Technische Universitaet Muenchen
+ * Arcisstr. 21
+ * 80333 Muenchen - Germany
+ * 
+ * _____________________________________________________________________________
+ *
+ *   IMTAphy is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   IMTAphy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with IMTAphy.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
+
+#ifndef WNS_SERVICE_PHY_CHANNELSTATEINFO_HPP
+#define WNS_SERVICE_PHY_CHANNELSTATEINFO_HPP
+
+#include <WNS/RefCountable.hpp>
+#include <WNS/service/phy/imta/IMTAphyObserver.hpp>
+#include <WNS/PowerRatio.hpp>
+#include <map>
+
+
+namespace wns { namespace service { namespace phy { namespace imta {
+
+                typedef unsigned int PRB;
+                typedef std::list<PRB> PRBList;
+                typedef std::map<PRB, wns::Ratio> PRBMapdB;
+                typedef std::map<PRB, wns::Power> PRBMapdBm;
+	 
+
+                class ChannelStateInfo :
+            public wns::RefCountable
+                {
+                public:
+                    PRBMapdB  sinrs;
+                    PRBMapdBm rxPowers;
+                };
+
+                typedef wns::SmartPtr<ChannelStateInfo> ChannelStateInfoPtr;
+       
+            }
+        }
+    }
+}
+
+#endif
 
=== added file 'src/service/phy/imta/DataReception.hpp'
--- src/service/phy/imta/DataReception.hpp	1970-01-01 00:00:00 +0000
+++ src/service/phy/imta/DataReception.hpp	2010-12-15 19:20:10 +0000
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of IMTAphy / openWNS
+ * _____________________________________________________________________________
+ *
+ * Copyright (C) 2010
+ * Institute of Communication Networks (LKN)
+ * Department of Electrical Engineering and Information Technology (EE & IT)
+ * Technische Universitaet Muenchen
+ * Arcisstr. 21
+ * 80333 Muenchen - Germany
+ * 
+ * _____________________________________________________________________________
+ *
+ *   IMTAphy is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   IMTAphy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with IMTAphy.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
+
+#ifndef WNS_SERVICE_PHY_IMTA_DATARECEPTION_HPP
+#define WNS_SERVICE_PHY_IMTA_DATARECEPTION_HPP
+
+#include <WNS/osi/PDU.hpp>
+#include <WNS/SmartPtr.hpp>
+#include <WNS/node/Interface.hpp>
+#include <WNS/service/phy/imta/ChannelStateInfo.hpp>
+
+namespace wns { namespace service { namespace phy { namespace imta {
+	
+                class DataReception :
+            public virtual service::Service {
+                public:
+                    virtual void onData(wns::osi::PDUPtr transportBlock, 
+                                        wns::node::Interface* source, 
+                                        wns::SmartPtr<ChannelStateInfo> csi) = 0;
+                    
+                };
+                
+            }}}}
+#endif
+
+
+  
 
=== added file 'src/service/phy/imta/DataTransmission.hpp'
--- src/service/phy/imta/DataTransmission.hpp	1970-01-01 00:00:00 +0000
+++ src/service/phy/imta/DataTransmission.hpp	2010-12-15 19:20:10 +0000
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * This file is part of IMTAphy / openWNS
+ * _____________________________________________________________________________
+ *
+ * Copyright (C) 2010
+ * Institute of Communication Networks (LKN)
+ * Department of Electrical Engineering and Information Technology (EE & IT)
+ * Technische Universitaet Muenchen
+ * Arcisstr. 21
+ * 80333 Muenchen - Germany
+ * 
+ * _____________________________________________________________________________
+ *
+ *   IMTAphy is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   IMTAphy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with IMTAphy.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
+
+#ifndef WNS_SERVICE_PHY_IMTA_DATATRANSMISSION_HPP
+#define WNS_SERVICE_PHY_IMTA_DATATRANSMISSION_HPP
+
+#include <WNS/node/Node.hpp>
+#include <WNS/PowerRatio.hpp>
+#include <WNS/osi/PDU.hpp>
+#include <WNS/service/Service.hpp>
+#include <WNS/service/phy/imta/ChannelStateInfo.hpp>
+#include <vector>
+
+namespace wns { namespace service { namespace phy { namespace imta {
+	
+   
+ 
+                class DataTransmission :
+            public virtual service::Service {
+                public:
+                    virtual void registerTransmission(wns::node::Interface* destination,
+                                                      // later: 
+                                                      // - precoding (vector/matrix),
+                                                      // - phymode
+                                                      wns::Power txPower,
+                                                      wns::osi::PDUPtr transportBlock,
+                                                      PRBList transmitPRBs,
+                                                      unsigned int TTI) = 0; 
+                };
+	
+            }}}}
+#endif
 
=== added file 'src/service/phy/imta/IMTAphyObserver.hpp'
--- src/service/phy/imta/IMTAphyObserver.hpp	1970-01-01 00:00:00 +0000
+++ src/service/phy/imta/IMTAphyObserver.hpp	2010-12-15 19:20:10 +0000
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * This file is part of IMTAphy / openWNS
+ * _____________________________________________________________________________
+ *
+ * Copyright (C) 2010
+ * Institute of Communication Networks (LKN)
+ * Department of Electrical Engineering and Information Technology (EE & IT)
+ * Technische Universitaet Muenchen
+ * Arcisstr. 21
+ * 80333 Muenchen - Germany
+ * 
+ * _____________________________________________________________________________
+ *
+ *   IMTAphy is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   IMTAphy is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with IMTAphy.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ ******************************************************************************/
+
+#ifndef WNS_SERVICE_PHY_IMTA_IMTAPHYOBSERVER_HPP
+#define WNS_SERVICE_PHY_IMTA_IMTAPHYOBSERVER_HPP
+
+#include <WNS/osi/PDU.hpp>
+#include <WNS/SmartPtr.hpp>
+
+namespace wns { namespace service { namespace phy { namespace imta {
+
+class IMTAphyObserver
+{
+    public:
+	virtual void onNewTTI(unsigned int ttiNumber) = 0;
+};
+
+}}}}
+
+#endif
+