From e0d57ba47adb261f19356c0ecebbb2fc3209dd61 Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Fri, 16 Dec 2011 17:55:13 +0100
Subject: [PATCH] Convert float values to %.6f when writing param_dsm.dat

---
 application/libraries/programs/Scatt.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/libraries/programs/Scatt.php b/application/libraries/programs/Scatt.php
index 4e9dd89..106bf0b 100644
--- a/application/libraries/programs/Scatt.php
+++ b/application/libraries/programs/Scatt.php
@@ -44,6 +44,17 @@ class Scatt extends Program_runner {
 	}
 
 	/**
+	 * Mapping function to generate correct float values
+	 */
+	private function formatNumbers($data) {
+		if($data['type'] == 'float')
+			$data['value'] = sprintf('%.6f', $data['value']);
+
+		return $data;
+	}
+
+	/**
+	 * Generate dafault.calc and param_dsm.dat files.
 	 *
 	 * @param unknown_type $experimentId
 	 */
@@ -59,8 +70,9 @@ class Scatt extends Program_runner {
 			@copy(FCPATH . 'uploads/' . $experiment['project_id'] . '/defaultmodel.obj', $path . 'default.obj');
 		}
 
-		$data['parameters'] = $this->CI->experiment->getParameters($experimentId);
-		
+		// get the parameters for this experiment and convert the simple float values to %.6f
+		$data['parameters'] = array_map(array($this, 'formatNumbers'), $this->CI->experiment->getParameters($experimentId));
+
 		@fwrite($handler, $this->CI->parser->parse_string($this->program['config_template'], $data, true));
 		@fclose($handler);