Way faster now

Furkan
1 parent 5cdfbf21
Showing 3 changed files with 85 additions and 108 deletions Show diff stats
php/classes/CatalogCacheMgr.php
php/classes/CatalogCacheObject.php
php/classes/TimeTableCacheMgr.php
@@ -207,116 +207,61 @@ class CatalogCacheMgr extends TimeTableCacheMgr
 		// Wrap the result in parentheses
 		return $str;
 	}
-	public function calculateAddColumn($firstColumnId, $secondColumnId, $operation, $newColumnObj, $intervals){
-		// Computing columns
-		$newColumnValues = array();
-		foreach($intervals['intervals'] as $interval){
-			$fColumnVectorValues = $this->stringToVector($interval[$firstColumnId]);
-			$sColumnVectorValues = $this->stringToVector($interval[$secondColumnId]);
-
-			if ($newColumnObj->size == 1){
-				switch ($operation) {
-					case 'plus':
-						$newColumnValues[$interval['cacheId']] = $interval[$firstColumnId] + $interval[$secondColumnId];
-						break;
-					case 'minus':
-						$newColumnValues[$interval['cacheId']] = $interval[$firstColumnId] - $interval[$secondColumnId];
-						break;
-					case 'multiplication':
-						$newColumnValues[$interval['cacheId']] = $interval[$firstColumnId] * $interval[$secondColumnId];
-						break;
-					case 'division':
-						$newColumnValues[$interval['cacheId']] = ($interval[$secondColumnId] == 0) ? NAN : $interval[$firstColumnId]  / $interval[$secondColumnId];;
-						break;
-				}
-			}
-			else{
-				switch ($operation) {
-					case 'plus':
-						if ($newColumnObj->size > 1){
-							if (count($fColumnVectorValues) !== count($sColumnVectorValues)) 
-								return array('success' => false, 'message' => "Addition not possible");
-							
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = $fColumnVectorValues[$i] + $sColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						break;
-					case 'minus':
-						if ($newColumnObj->size > 1){
-							if (count($fColumnVectorValues) !== count($sColumnVectorValues)) 
-								return array('success' => false, 'message' => "Vectors must be of the same length.");
-							
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = $fColumnVectorValues[$i] - $sColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else{
-							return array('success' => false, 'message' => "Substraction not possible");
-						}
-						
-						break;
-					case 'multiplication':
-						if (count($fColumnVectorValues) == count($sColumnVectorValues)) {
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = $fColumnVectorValues[$i] * $sColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else if(count($fColumnVectorValues) == 1){
-							$result = [];
-							for ($i = 0; $i < count($sColumnVectorValues); $i++) 
-								$result[] = $fColumnVectorValues[0] * $sColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else if(count($sColumnVectorValues) == 1){
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = $sColumnVectorValues[0] * $fColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else{
-							return array('success' => false, 'message' => "Multiplication not possible");
-						}
-						
-						break;
-					case 'division':
-						if (count($fColumnVectorValues) == count($sColumnVectorValues)) {
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = ($sColumnVectorValues[$i] == 0) ? NAN :$fColumnVectorValues[$i] / $sColumnVectorValues[$i];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else if(count($sColumnVectorValues) == 1){
-							$result = [];
-							for ($i = 0; $i < count($fColumnVectorValues); $i++) 
-								$result[] = ($sColumnVectorValues[0] == 0) ? NAN : $fColumnVectorValues[$i] / $sColumnVectorValues[0];
-							$newColumnValues[$interval['cacheId']] = $result;
-						}
-						else{
-							return array('success' => false, 'message' => "Division not possible");
-						}
-						
-						
-						break;
-					default:
-						break;
-				}
-			}
  
-		
-			
-		}
-		for ($i = 0; $i < count($newColumnValues); $i++) 
-		{
-			$data= array(); 
-			$data[$newColumnObj->id] = (count($newColumnValues[$i]) > 1) ? $this->vectorToString($newColumnValues[$i]) : $newColumnValues[$i];
-			if(!$this->modifyIntervalFromId($i, $data))
-				return array('success' => false, 'message' => "Impossible to modify the column");
+	public function calculateAddColumn($firstColumnId, $secondColumnId, $operation, $newColumnObj, $intervals) {
+    // Computing columns
+    $newColumnValues = array();
+    $isSingleValue = ($newColumnObj->size == 1);
+
+    foreach ($intervals['intervals'] as $interval) {
+        $fColumnVectorValues = $this->stringToVector($interval[$firstColumnId]);
+        $sColumnVectorValues = $this->stringToVector($interval[$secondColumnId]);
+
+        if ($isSingleValue) {
+            $newColumnValues[$interval['cacheId']] = $this->performOperation($interval[$firstColumnId], $interval[$secondColumnId], $operation);
+        } else {
+            $fCount = count($fColumnVectorValues);
+            $sCount = count($sColumnVectorValues);
+
+            if ($fCount !== $sCount) {
+                return array('success' => false, 'message' => "Vectors must be of the same length.");
+            }
+
+            $result = array();
+            for ($i = 0; $i < $fCount; $i++) {
+                $result[] = $this->performOperation($fColumnVectorValues[$i], $sColumnVectorValues[$i], $operation);
+            }
+            $newColumnValues[$interval['cacheId']] = $result;
+        }
+    }
+
+    $data = array();
+    foreach ($newColumnValues as $cacheId => $value) {
+        $data[$cacheId] = array(
+            $newColumnObj->id => (is_array($value)) ? $this->vectorToString($value) : $value
+        );
+    }
+
+    if (!$this->modifyIntervals($data)) {
+        return array('success' => false, 'message' => "Impossible to modify the columns");
+    }
+
+    return array('success' => true, 'token' => $this->cache->getToken(), 'status' => $this->cache->getStatus(), 'parameters' => $this->cache->getParametersInfo());
+}
+	
+	private function performOperation($a, $b, $operation) {
+		switch ($operation) {
+			case 'plus':
+				return $a + $b;
+			case 'minus':
+				return $a - $b;
+			case 'multiplication':
+				return $a * $b;
+			case 'division':
+				return ($b == 0) ? NAN : $a / $b;
+			default:
+				return null;
 		}
-		return array('success' => true , 'token' => $this->cache->getToken(), 'status' => $this->cache->getStatus(),'parameters' => $this->cache->getParametersInfo());
 	}
 }
 ?>
@@ -197,6 +197,26 @@ class CatalogCacheObject extends TimeTableCacheObject
 			return true;
 	}
  
+	public function modifyIntervals($data) {
+		$modified = false;
+	
+		foreach ($this->intervals as $interval) {
+			$cacheId = $interval->getId();
+
+			$result = parent::modifyIntervalFromId($cacheId, $data);
+			if (isset($data[$cacheId])) {
+				foreach ($data[$cacheId] as $key => $value) {
+					$interval->setParamValue($key, $value);
+					$interval->setIsModified(true);
+					$this->isModified = true;
+				}
+				$modified = true;
+			}
+		}
+	
+		return $modified;
+	}
+
 	public function modifyIntervalFromId($cacheId, $data) {
 		$result = parent::modifyIntervalFromId($cacheId, $data);
  
@@ -267,6 +267,18 @@
 		return array('success' => true, 'status' => $this->cache->getStatus());
 	}
  
+	public function modifyIntervals($data) {
+		if (!$this->loadFromFile())
+			return array('success' => false, 'message' => 'Cannot load cache file');
+
+		$this->cache->modifyIntervals($data);
+
+		$this->saveToFile();
+
+		return array('success' => true, 'status' => $this->cache->getStatus());
+	}
+
+
 	public function modifyIntervalFromId($cacheId, $data) {
 		if (!$this->loadFromFile())
 			return array('success' => false, 'message' => 'Cannot load cache file');