Merge pull request #49 from pafonso/iminleg_rebase

Iminleg rebase

Author: dawagner

Schemas/Parameter.xsd

@@ -34,12 +34,21 @@
 	<xs:complexType name="Adaptation">
 		<xs:attribute name="Offset" type="xs:integer" default="0"/>
 	</xs:complexType>
-	<xs:element name="LinearAdaptation">
+	<xs:complexType name="LinearAdaptationType">
+		<xs:complexContent>
+			<xs:extension base="Adaptation">
+				<xs:attribute name="SlopeNumerator" type="xs:double" default="1"/>
+				<xs:attribute name="SlopeDenominator" type="xs:double" default="1"/>
+			</xs:extension>
+		</xs:complexContent>
+	</xs:complexType>
+	<xs:element name="LinearAdaptation" type="LinearAdaptationType"/>
+	<xs:element name="LogarithmicAdaptation">
 		<xs:complexType>
 			<xs:complexContent>
-				<xs:extension base="Adaptation">
-					<xs:attribute name="SlopeNumerator" type="xs:double" default="1"/>
-					<xs:attribute name="SlopeDenominator" type="xs:double" default="1"/>
+				<xs:extension base="LinearAdaptationType">
+					<xs:attribute name="LogarithmBase" type="xs:double" default="10"/>
+					<xs:attribute name="FloorValue" type="xs:double" default="-INF"/>
 				</xs:extension>
 			</xs:complexContent>
 		</xs:complexType>
@@ -63,6 +72,7 @@
 			<xs:extension base="Parameter">
 				<xs:choice minOccurs="0">
 					<xs:element ref="LinearAdaptation"/>
+					<xs:element ref="LogarithmicAdaptation"/>
 				</xs:choice>
 				<xs:attributeGroup ref="IntegerParameterAttributes"/>
 				<xs:attribute name="Unit" type="xs:token" use="optional"/>

bindings/python/Android.mk

@@ -76,6 +76,7 @@ $(generated-sources-dir)/pfw_wrap.h: $(generated-sources-dir)/pfw_wrap.cxx
 $(generated-sources-dir)/pfw_wrap.cxx: $(LOCAL_PATH)/pfw.i
 	@echo "Generating Python binding files"
 	mkdir -p $(dir $@) # surprisingly, path is not generated by build system
+	mkdir -p $(HOST_LIBRARY_PATH)
 	prebuilts/misc/linux-x86_64/swig/swig \
 		-Iprebuilts/misc/common/swig/include/2.0.11/python/ \
 		-Iprebuilts/misc/common/swig/include/2.0.11/ \

bindings/python/pfw.i

@@ -169,10 +169,6 @@ public:
     bool exportSingleDomainXml(std::string& strXmlDest, const std::string& strDomainName, bool bWithSettings,
                                bool bToFile, std::string& strError) const;
 %clear std::string& strXmlDest;
-
-%apply std::string &OUTPUT { std::string& strResult }
-    bool getSystemClassXMLString(std::string& strResult);
-%clear std::string& strResult;
 };
 
 // SWIG nested class support is not complete - cf.

parameter/Android.mk

@@ -79,6 +79,7 @@ common_src_files := \
         InstanceDefinition.cpp \
         IntegerParameterType.cpp \
         LinearParameterAdaptation.cpp \
+        LogarithmicParameterAdaptation.cpp \
         MappingContext.cpp \
         MappingData.cpp \
         ParameterAccessContext.cpp \
@@ -155,6 +156,8 @@ LOCAL_C_INCLUDES := $(common_c_includes)
 LOCAL_SHARED_LIBRARIES := $(common_shared_libraries) libdl
 LOCAL_STATIC_LIBRARIES := libxmlserializer libpfw_utility libxml2
 
+LOCAL_REQUIRED_MODULES := libremote-processor
+
 LOCAL_CLANG := false
 include external/stlport/libstlport.mk
 include $(BUILD_SHARED_LIBRARY)

parameter/CMakeLists.txt

@@ -64,6 +64,7 @@ add_library(parameter SHARED
     InstanceDefinition.cpp
     IntegerParameterType.cpp
     LinearParameterAdaptation.cpp
+    LogarithmicParameterAdaptation.cpp
     MappingContext.cpp
     MappingData.cpp
     ParameterAccessContext.cpp

parameter/IntegerParameterType.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Intel Corporation
+ * Copyright (c) 2011-2015, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -37,6 +37,11 @@ CLinearParameterAdaptation::CLinearParameterAdaptation() : base("Linear"), _dSlo
 {
 }
 
+CLinearParameterAdaptation::CLinearParameterAdaptation(const string& strType) :
+    base(strType), _dSlopeNumerator(1), _dSlopeDenominator(1)
+{
+}
+
 // Element properties
 void CLinearParameterAdaptation::showProperties(string& strResult) const
 {

parameter/IntegerParameterType.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2014, Intel Corporation
+ * Copyright (c) 2011-2015, Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -37,6 +37,7 @@ class CLinearParameterAdaptation : public CParameterAdaptation
 {
 public:
     CLinearParameterAdaptation();
+    CLinearParameterAdaptation(const std::string& strType);
 
     // Conversions
     virtual int64_t fromUserValue(double dValue) const;

parameter/LinearParameterAdaptation.cpp

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2011-2015, Intel Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "LogarithmicParameterAdaptation.h"
+#include <math.h>
+
+#define base CLinearParameterAdaptation
+
+// M_E is the base of the natural logarithm for 'e' from math.h
+CLogarithmicParameterAdaptation::CLogarithmicParameterAdaptation() : base("Logarithmic"),
+    _dLogarithmBase(M_E), _dFloorValue(-INFINITY)
+{
+}
+
+// Element properties
+void CLogarithmicParameterAdaptation::showProperties(std::string& strResult) const
+{
+    base::showProperties(strResult);
+
+    strResult += " - LogarithmBase: ";
+    strResult += toString(_dLogarithmBase);
+    strResult += "\n";
+    strResult += " - FloorValue: ";
+    strResult += toString(_dFloorValue);
+    strResult += "\n";
+}
+
+bool CLogarithmicParameterAdaptation::fromXml(const CXmlElement& xmlElement,
+                                            CXmlSerializingContext& serializingContext)
+{
+
+    if (xmlElement.hasAttribute("LogarithmBase")) {
+
+        _dLogarithmBase = xmlElement.getAttributeDouble("LogarithmBase");
+
+        // Avoid negative and 1 values
+        if (_dLogarithmBase <= 0 || _dLogarithmBase == 1) {
+            serializingContext.setError("LogarithmBase attribute cannot be negative or 1 on element"
+                                        + xmlElement.getPath());
+
+            return false;
+        }
+    }
+
+    if (xmlElement.hasAttribute("FloorValue")) {
+        _dFloorValue = xmlElement.getAttributeDouble("FloorValue");
+    }
+    // Base
+    return base::fromXml(xmlElement, serializingContext);
+}
+
+
+int64_t CLogarithmicParameterAdaptation::fromUserValue(double dValue) const
+{
+    return fmax(round(base::fromUserValue(log(dValue) / log(_dLogarithmBase))),
+                        _dFloorValue);
+}
+
+double CLogarithmicParameterAdaptation::toUserValue(int64_t iValue) const
+{
+    return exp(base::toUserValue(iValue) * log(_dLogarithmBase));
+}