Changeset 144 for trunk/matml/webselector/php/dbquery.php.inc

Timestamp:

12/15/2004 04:14:49 PM (7 years ago)

Author:

vieyra

Message:

Added the new user interface, and file select_other.php as an example
Added pow() method to Units class
Added function db_get_plot_single_values() which basically does the same as db_get_plot_values, but for multiple queries
Added "free" plot type to plot.php to make it compatible with the previous interface
Units are assigned it db_get_plot_single_values() for the properties
Broken Materials Categories in select_other.php
Broken Materials Map Selection in select_other.php
I suggest a better Unit handling class, this one is good but is rapidly falling short for our purposes

Files:

• trunk/matml/webselector/php/dbquery.php.inc (modified) (7 diffs)

trunk/matml/webselector/php/dbquery.php.inc

@@ -54 +54 @@
         else
             $mine[1].=$eirs[1];
+        if(!$mine[1])
+            $name=$mine[0];
+        else
+            $name="$mine[0]/$mine[1]";
+        $ret=new Unit(
+            "$name",
+            $this->num_name*$other->num_name,
+            $this->scale*$other->scale
+        );
+        return $ret;
+    }
+    function pow($power)
+    {
+
+      // Write the actual POW function
+
+        $mine=$this->name_split();
+
+
+      if( $power > 1){
+        if($mine[0])
+          {
+            $mine[0].="^$power";
+          }
+        if($mine[1])
+          {
+            $mine[1].="^$power";
+          }
+      }
+      elseif($power == 1){
+        //Do nothing
+      }
+      elseif( $power == 0){
+
+        if($mine[0])
+          {
+            $mine[0]="1";
+          }
+        if($mine[1])
+          {
+            $mine[1]="1";
+          }
+      }
+      elseif($power == -1){
+
+        if($mine[0]&&$mine[1])
+          {
+            $temp   = $mine[0];
+            $mine[0]= $mine[1];
+            $mine[1]= $temp;
+          }
+        elseif($mine[1]&&!$mine[0])
+          {
+            $mine[0]=$mine[1];
+            $mine[1]="";
+          }
+        elseif($mine[0]&&!$mine[1])
+          {
+            $mine[1]=$mine[0];
+            $mine[0]=1;
+          }
+
+
+      }
+      elseif($power < -1){      
+
+
+                if($mine[0]&&$mine[1])
+          {
+            $temp   = $mine[0];
+            $mine[0]= "$mine[1]^".abs($power);
+            $mine[1]= "$temp^".abs($power);
+          }
+        elseif($mine[1]&&!$mine[0])
+          {
+            $mine[0]="$mine[1]^".abs($power);
+            $mine[1]="";
+          }
+        elseif($mine[0]&&!$mine[1])
+          {
+            $mine[1]="$mine[0]^".abs($power);
+            $mine[0]=1;
+          }
+
+      }
+
+
         if(!$mine[1])
             $name=$mine[0];
@@ -160 +247 @@
        array_flip(array("Heat Capacity","Specific Heat"))
     );
+   
    $translation_string="\"abcdefghijklmnopqrstuvwxyz'\",'ABCDEFGHIJKLMNOPQRSTUVWXYZ'";
    $ret=array();
@@ -235 +323 @@
         $ret[$key]=$data;
    }
+
+//    echo "<br><br>";
+//    print_r($ret);
+
    return $ret;
 }
@@ -385 +477 @@
     $handle = opendir('materials');
 
+
+//     echo "<br><br>Begin Query <br>";
+//     print_r($query);
+//     echo "<br>End Query<br>";
+    
+
     while (false !== ($file = readdir($handle))) {
         if(preg_match("/\.xml?$/",$file)==1)
@@ -391 +489 @@
             $values=get_property_data("materials/$file",$query);
 
-            if(isset($values["Xquery"])&&
+//          echo "<br><br>Begin Values <br>";
+//          print_r($values);
+//          echo "End Values <br>";
+
+
+            If(isset($values["Xquery"])&&
                 isset($values["Yquery"])
             )
@@ -425 +528 @@
                         $names[]=$values["Matid"];
                         $categories[]=$category;
+                        
                 }
             }
@@ -468 +572 @@
 }
 
+function db_get_plot_single_values($property_listx, $property_listy, $log, $category_options){ 
+
+    global $unit_infos;
+
+
+    // Prepare Array list
+
+
+     $query = array();
+     $power = array();
+     $NXqueries = array();
+     $NYqueries = array();
+
+     $xml_name = array(
+                        "Density" => "Density",
+                        "E"       => "Young's Modulus",
+                        "Cp"      => "Heat Capacity",
+                        "K"       => "Thermal Conductivity",
+                        "YS"      => "Yield Strength"
+                        );
+
+
+     $prop_units = array(
+                         "Density" => $unit_infos["g"]->div($unit_infos["cc"]),
+                         "E"       => $unit_infos["MPa"],
+                         "YS"      => $unit_infos["MPa"],
+                         "Cp"      => $unit_infos["J"]->div($unit_infos["g"]->mul($unit_infos["°C"])),
+                         "K"      => $unit_infos["W"]->div($unit_infos["m"]->mul($unit_infos["K"])),
+                         );
+
+    $index = 0;
+    $xlabel_num ="";
+    $ylabel_num ="";
+    $xlabel_den ="";
+    $ylabel_den ="";
+
+    foreach( $property_listx as $property=>$pow){
+      $index++;
+      $query["Xquery$index"]="$xml_name[$property]";
+      $power["Xquery$index"]= $pow;
+      $final_units["Xquery$index"] = $prop_units["$property"];
+
+      if( $pow > 1){
+        $xlabel_num = "$xml_name[$property]^$pow *";
+      }
+      elseif($pow == 1){
+        $xlabel_num = "$xml_name[$property]*";
+      }
+      elseif($pow == -1){
+        $xlabel_den = "$xml_name[$property]*";
+      }
+      elseif($pow < -1){      
+        $xlabel_den = "$xml_name[$property]^".abs($pow)."*";
+      }
+
+      array_push($NXqueries, "Xquery$index");
+    }
+
+    $index = 0;
+    
+
+    foreach( $property_listy as $property=>$pow){
+      $index++;
+      $query["Yquery$index"]="$xml_name[$property]";
+      $power["Yquery$index"]= $pow;
+      $final_units["Yquery$index"] = $prop_units["$property"];
+
+      if( $pow > 1){
+        $ylabel_num = "$xml_name[$property]^$pow *";
+      }
+      elseif($pow == 1){
+        $ylabel_num = "$xml_name[$property]*";
+      }
+      elseif($pow == -1){
+        $ylabel_den = "$xml_name[$property]*";
+      }
+      elseif($pow < -1){      
+        $ylabel_den = "$xml_name[$property]^".abs($pow)."*";
+      }
+      
+      array_push($NYqueries, "Yquery$index");
+    }
+
+    $ALLqueries = array_merge($NXqueries,$NYqueries);
+
+    // Prepare final units
+ 
+
+    $first = 0;
+    foreach($NXqueries as $Nquery){
+      
+      if($first){
+        $Xunits =  $Xunits->mul($final_units["$Nquery"]->pow($power["$Nquery"]));
+      }
+      else{
+        $Xunits = $final_units["$Nquery"]->pow($power["$Nquery"]);
+        $first = 1;
+      }
+
+    }
+
+    $first = 0;
+    foreach($NYqueries as $Nquery){
+      
+      if($first){
+        $Yunits =  $Yunits->mul($final_units["$Nquery"]->pow($power["$Nquery"]));
+      }
+      else{
+        $Yunits = $final_units["$Nquery"]->pow($power["$Nquery"]);
+        $first = 1;
+      }
+
+    }
+
+
+
+    // Prepare final labels
+
+    $xlabel_num = substr($xlabel_num,0,-1);
+    $xlabel_den = substr($xlabel_den,0,-1);
+    $ylabel_num = substr($ylabel_num,0,-1);
+    $ylabel_den = substr($ylabel_den,0,-1);
+
+    $xlabel_num = ($xlabel_num != "")?"$xlabel_num":1;
+    $ylabel_num = ($ylabel_num != "")?"$ylabel_num":1;
+
+    $xlabel = ($xlabel_den != "")?"$xlabel_num / $xlabel_den":"$xlabel_num";
+    $ylabel = ($ylabel_den != "")?"$ylabel_num / $ylabel_den":"$ylabel_num";
+
+    $xlabel .= " (".$Xunits->name.")";
+    $ylabel .= " (".$Yunits->name.")";
+
+
+  $query["categories"]="Material Categories";
+  
+    $valuesY = array();
+    $valuesX = array();
+    $valuese = array();
+    $categories = array();
+  
+    $handle = opendir('materials');
+
+//          echo "<br><br>Begin Query <br>";
+//          print_r($query);
+//          echo "End Query<br>";
+
+
+
+    while (false !== ($file = readdir($handle))) {
+        if(preg_match("/\.xml?$/",$file)==1)
+        {
+            // Fetch values from DB and sort them in an array (actually 3 arrays)
+            $values=get_property_data("materials/$file",$query);
+
+
+//          echo "<br><br>Begin Values <br>";
+//          print_r($values);
+//          echo "End Values <br>";
+
+            
+            
+            // If isset (for all values)
+
+            $allset = 1;
+
+            foreach( $ALLqueries as $Nquery){
+              if(isset($values["$Nquery"]))
+                $allset *= 1;
+                 else
+                   $allset *= 0;
+            }
+
+
+            if( $allset )
+            {
+
+              // Category part, deal with it later
+                $values_categories=$values["categories"];
+                $values_categories[]="";
+                foreach($values_categories as $category)
+                {
+                    if(isset($category_options[$category]))
+                        break;
+                }
+                if(!isset($category_options[$category]))
+                    continue;
+                $category=$category_options[$category];
+                // Category part, deal with it later
+                
+
+
+
+                //Force unit match for all queries
+
+                foreach( $NXqueries as $Nquery){
+                  force_unit_match($values["Matid"],$final_units["$Nquery"],$values["$Nquery"]);
+                }
+
+                foreach( $NYqueries as $Nquery){
+                  force_unit_match($values["Matid"],$final_units["$Nquery"],$values["$Nquery"]);
+                }
+
+                //Scale units
+                //and add them to the array
+
+                $cont = 1;
+
+                // And the Power?
+
+                foreach( $NXqueries as $Nquery){
+                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_units["$Nquery"]->scale);
+                }
+                $valuesX[]=$cont;
+                  
+                $cont = 1;
+
+                foreach( $NYqueries as $Nquery){
+                  $cont *= ( pow($values["$Nquery"]->avg_value,$power["$Nquery"]) /$final_units["$Nquery"]->scale);
+                }
+                $valuesY[]=$cont;
+
+                
+//              print_r($valuesX);
+//              echo "<br>";
+//              print_r($valuesY);
+//              echo "<br>";
+                
+
+                // Add Matid
+                $names[]=$values["Matid"];
+                
+                // Something else for category
+                $categories[]=$category;
+
+            }
+        }
+    }
+    closedir($handle);
+  
+
+    //assing label
+
+//     $ylabel = "$property_listy[0]";
+//     $xlabel = "$property_listx[0]";
+
+ 
+
+    return array(&$valuesX, &$valuesY, &$names, $xlabel, $ylabel, $categories);
+
+}
+
+
+
+
+
 //var_dump(db_get_plot_values("EvsD","")); 
 ?>