[LON-CAPA-cvs] cvs: modules /gerd/harvesting seq_taxonomy.pl taxonomy.dat

www www at source.lon-capa.org
Fri Sep 9 20:45:00 EDT 2011


www		Sat Sep 10 00:45:00 2011 EDT

  Modified files:              
    /modules/gerd/harvesting	seq_taxonomy.pl taxonomy.dat 
  Log:
  Work on taxonomy
  
  
-------------- next part --------------
Index: modules/gerd/harvesting/seq_taxonomy.pl
diff -u modules/gerd/harvesting/seq_taxonomy.pl:1.1 modules/gerd/harvesting/seq_taxonomy.pl:1.2
--- modules/gerd/harvesting/seq_taxonomy.pl:1.1	Fri Sep  9 02:44:17 2011
+++ modules/gerd/harvesting/seq_taxonomy.pl	Sat Sep 10 00:45:00 2011
@@ -18,7 +18,6 @@
       $isnots[$i]=$isnots[$catidx{$equiv}];
    }
    $catidx{$cat}=$i;
-   print $i." ".$cat."\n";
    $i++;
 }
 close(IN);
@@ -29,15 +28,16 @@
    chomp($line);
    my ($seq,$subs,$keys)=split(/\t/,$line);
 
-   print "-------$subs $keys\n";
+#   print "-------$subs $keys\n";
 
    my %keysw=();
    foreach my $keyc (split(/\,/,$keys)) {
       my ($key,$cnt)=split(/\:/,$keyc);
       $keysw{$key}=$cnt;
    }
-   my %successes=();
+   my $winners='';
    foreach my $subc (split(/\,/,$subs)) {
+      my %successes=();
       my ($sub,$cnt)=split(/\:/,$subc);
       for (my $i=0;$i<=$#cats;$i++) {
           if ($cats[$i]=~/^$sub\:/) {
@@ -53,17 +53,19 @@
              }
           } 
       }
-   }
-   my $max=0;
-   my $winner='';
-   foreach my $suc (keys(%successes)) {
-      if ($successes{$suc}>$max) {
-         $max=$successes{$suc};
-         $winner=$suc;
+      my $max=0;
+      my $winner='';
+      foreach my $suc (keys(%successes)) {
+         if ($successes{$suc}>$max) {
+            $max=$successes{$suc};
+            $winner=$suc;
+         }
       }
+      if ($winner) { $winners.=','.$winner; }
    }
-   print "Winner: $winner\n";
-   $j++;
-   if ($j>200) {last;}
+   $winners=~s/^\,//;
+   print $seq."\t".$winners."\n";
+#   $j++;
+#   if ($j>500) {last;}
 }
 close(IN);
Index: modules/gerd/harvesting/taxonomy.dat
diff -u modules/gerd/harvesting/taxonomy.dat:1.1 modules/gerd/harvesting/taxonomy.dat:1.2
--- modules/gerd/harvesting/taxonomy.dat:1.1	Fri Sep  9 02:44:17 2011
+++ modules/gerd/harvesting/taxonomy.dat	Sat Sep 10 00:45:00 2011
@@ -1,37 +1,55 @@
 physics:introduction:mathematics	vector,vectors,derivative,integral	energy,momentum,force,wave
 physics:introduction:units	unit,measurement,system	energy,momentum
-physics:mechanics:linearkinematics	speed,velocity,acceleration,distance,displacement,position	angular,angle,force,work,atom,quantum,momentum,inertia
-physics:mechanics:rotationalkinematics	angular,speed,velocity,acceleration,angle	work,force,torque,atom,quantum	
-physics:mechanics:lineardynamics	force,acceleration,mass,newton	torque,angle,angular,charge,magnetic,atom,quantum,work
-physics:mechanics:rotationaldynamics	torque,angular,acceleration,inertia	atom,quantum,momentum
+physics:mechanics:linearkinematics	speed,velocity,acceleration,distance,displacement,position	angular,angle,force,forces,friction,work,atom,quantum,momentum,inertia
+physics:mechanics:rotationalkinematics	angular,speed,velocity,acceleration,angle,angles,degree,degrees,radians,displacement	work,force,torque,atom,quantum	
+physics:mechanics:lineardynamics	force,forces,free,diagram,acceleration,mass,newton	torque,angle,angular,charge,magnetic,atom,quantum,work
+physics:mechanics:rotationaldynamics	torque,angular,acceleration,inertia,moment	atom,quantum,momentum
 physics:mechanics:linearmomentum	momentum,velocity,mass,collision,collisions,elastic,inelastic	angular,atom,quantum
-physics:mechanics:angularmomentum	momentum,velocity,angular,inertia	atom,quantum
+physics:mechanics:angularmomentum	momentum,velocity,angular,inertia,moment,torque	atom,quantum
 physics:mechanics:energy	energy,force,distance,work,potential,kinetic,gravitational,gravity	entropy,charge,atom,quantum,electric
 physics:mechanics:oscillation	period,frequency,resonance,amplitude,harmonic,spring	wavelength,current
-physics:mechanics:wave	period,frequency,wavelength,speed	sound,doppler
+physics:mechanics:wave	period,frequency,wavelength,speed,node,antinode,nodes	sound,doppler
 physics:mechanics:sound	sound,frequency,wavelength,speed,doppler,pressure,air,hear,water,longitudinal	magnetic,electric,field
-physics:thermodynamics	energy,work,pressure,temperature,gas,ideal,entropy,gas,volume
-physics:electromagnetism:electrostatics	electric,charge,coulomb,coulombs,field	magnet,capacitor
+physics:thermodynamics:temperature	temperature,kelvin,celsius,fahrenheit
+physics:thermodynamics:states	phase,temperature,liquid,gas,solid,presssure,triple,melt,melting,evaporate,evaporation
+physics:thermodynamics:gaslaws	energy,work,pressure,temperature,gas,ideal,entropy,gas,volume
+physics:electromagnetism:electrostatics	electric,charge,coulomb,coulombs,field,charged,charges	magnet,capacitor
 physics:electromagnetism:potentials	voltage,potential,field	current,ampere,amperes
 physics:electromagnetism:capacitance	capacitance,capacitor,charge,plate,farad
-physics:electromagnetism:magnetism	magnetic,current,ampere,amperes,field,magnet,solenoid	wave,quantum
+physics:electromagnetism:magnetism	magnetic,current,ampere,amperes,field,magnet,solenoid,force	wave,quantum
 physics:electromagnetism:inductance	magnetic,induction,inductance,coil,mutual,loop,emf
 physics:electromagnetism:dccircuits	current,battery,voltage,potential,voltage,resistor,resistance,ampere,resistor	frequency,phase,resonance
 physics:electromagnetism:accircuits	current,voltage,frequency,resonance,phase,ac,oscillator,inductor,inductance,resistor,resistance,capacitor,capacitance	pressure,sound,air,wave
-physics:electromagnetism:emwaves	magnetic,electric,field,speed,wavelength,frequency,amplitude,color,pressure,radiation,intensity	lens,interference,sound,air,emf
-physics:optics:mirrorslenses	light,lens,mirror,lenses,mirrors,focal,concave,convex,virtual,ray,reflection,diffraction
-physics:optics:opticalinstruments	telescope,microscope,glasses
-physics:optics:interference	slit,pattern,diffraction,interference	quantum
-physics:modern:relativity	frame,relative,dilation,contraction,time,space,transform,light,observer,speed
-physics:modern:quantum	spin,quantum,level,energy,atom,atoms,electron,electrons,wave,state,states,line	isotope,nuclear,neutron,neutrons
+physics:electromagnetism:emwaves	magnetic,electric,field,speed,wavelength,frequency,amplitude,color,pressure,radiation,intensity	lens,interference,sound,air,emf,force,static
+physics:optics:mirrorslenses	light,lens,mirror,lenses,mirrors,focal,concave,convex,virtual,ray,reflection,diffraction,focus,eye,magnifying,power,index,refraction,glass
+physics:optics:opticalinstruments	telescope,microscope,glasses,eyepiece,magnification
+physics:optics:interference	slit,pattern,diffraction,interference,grating,maxima,slits,minima	quantum
+physics:modern:relativity	frame,relative,dilation,contraction,time,space,transform,light,observer,speed,relativity,invariant,invariance,momentum,energy	lens,lenses,diffraction,eye,focus,friction
+physics:modern:quantum	spin,quantum,level,energy,atom,atoms,electron,electrons,wave,state,states,line	isotope,nuclear,neutron,neutrons	compound
 physics:modern:nuclear	nucleus,proton,neutron,decay,halflife,atoms,atomic,protons,neutrons,isotope,radioactive,beta,gamma,activity,nuclear,mass,radiation
-chemistry:atomsmolecules:nuclear			physics:modern:nuclear
-chemistry:atomsmolecules:shell			physics:modern:quantum
-chemistry:atomsmolecules:binding	binding,covalent,bond,bonding,ionic
-chemistry:thermodynamics			physics:thermodynamics
-chemistry:phases:transitions	phase,temperature,liquid,gas,solid,molecule,pressure
-chemistry:phases:solid		crystal,solid,structure,lattice
+chemistry:introduction:units	unit,measurement,mass,fahrenheit,celsius,kelvin,joule,rounding,significant
+chemistry:introduction:states			physics:thermodynamics:states
+chemistry:introduction:mixtures	substance,matter,pure,mixture,mixtures,homogenous,heterogenous
+chemistry:introduction:compounds	compound,compounds,element
+chemistry:introduction:periodictable	elements,element,periodic,table,alkali,alkaline,metals,halogens,noble,transition
+chemistry:introduction:massconservation	mass,conservation,reaction,reactions
+chemistry:introduction:energy		exothermic,endothermic,energy,reaction,reactions,heat
+chemistry:matter:nuclear			physics:modern:nuclear
+chemistry:matter:shell			physics:modern:quantum
+chemistry:bonding:ionic	bonding,bond,ions,ionic,compound,compounds
+chemistry:bonding:covalent	bonding,bond,covalent,molecule,molecules,single,double,triple,coordinate,lewis
+chemistry:bonding:polarity	bonding,bond,polar,polarity,nonpolar,electronegative,electronegativity
+chemistry:reactions:redox	oxidized,reduced,redox,agent,reaction,oxidizing,reducing
+chemistry:reactions:energy	heat,entropy,exothermic,endothermic,reaction,free,energy
+chemistry:reactions:rate	rate,time,catalyst,concentration,size,reactant,temperature,activation
+chemistry:reactions:reversible	equilibrium,reversible,keq,lechatelier,concentration,temperature
+chemistry:reactions:equations	balance,balanced,equation,equations,stoichiometry,reactant,reactants,stoichiometric,balancing
+chemistry:matter:solutions	saturated,unsaturated,supersaturated,solution,solutions,concentration,ppm,ppb,molarity,dilute
+chemistry:matter:colloidssuspensions	suspension,colloid,colligative,osmosis,suspended,solution,dispersion,vapor,hypertonic
+chemistry:matter:acidsbases	acid,base,acids,bases,arrhenius,hydrogen,ion,water,ph,neutralization	
+chemistry:organic:introduction	organic,carbon,hydrogen,oxygen
 statistics:descriptive:means	mean,standard,deviation,value,proability,number,measure,measurement,median,formula
+mathematics:numbers:fractions	numerator,rational,fraction,fractions,denominator,simplification,simplify
 mathematics:functions:trigonometric	function,functions,cosine,sine,tangent,sin,cos,period,pi
 mathematics:functions:exponential	function,functions,exponent,exponential,power
 mathematics:functions:logarithmic	function,functions,logarithm,logarithmic,hyperbolic


More information about the LON-CAPA-cvs mailing list