Kolpack-Software-Consulting/LeafWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New conversion complete

Browse Source
This commit is contained in:
poprhythm
2015-12-07 12:38:58 -05:00
parent 5b85662bdb
commit 50ae6cb52c
25 changed files with 815 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/Charter/CurveData.cs
+10 -26
View File
@@ -1,37 +1,21 @@
using System.IO;
using System.ComponentModel;
namespace LeafWeb.Core.Charter
{
public class CurveData
{
private readonly string _curveId;
public string CurveId { get; set; }
public string CurveId => _curveId;
[DisplayName("Internal conductance fixed, compensation point and M-M constants fixed")]
public CurveParamSet FixedCndFixedCmp { get; set; }
// 1
public CurveParamSet FixedCndFixedCmp { get; }
// 2
public CurveParamSet FixedCndEstimatedCmp { get; }
[DisplayName("Internal conductance fixed, compensation point and M-M constants estimated")]
public CurveParamSet FixedCndEstimatedCmp { get; set; }
// 3
public CurveParamSet EstimatedCndFixedCmp { get; }
[DisplayName("Internal conductance estimated, compensation point and M-M constants fixed")]
public CurveParamSet EstimatedCndFixedCmp { get; set; }
// 4
public CurveParamSet EstimatedCndEstimatedCmp { get; }
public CurveData(TextReader sr, ref int lineNbr)
{
// For each curve in the output file there are four sets of data.
FixedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
FixedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
}
[DisplayName("Internal conductance estimated, compensation point and M-M constants estimated")]
public CurveParamSet EstimatedCndEstimatedCmp { get; set; }
}
}
Core/Charter/CurveDataConverter.cs
+128
View File
@@ -0,0 +1,128 @@
using System;
using System.Collections.Generic;
using System.Linq;
using LeafWeb.Core.Models;
using LeafWeb.Core.Utility;
namespace LeafWeb.Core.Charter
{
public class CurveDataConverter
{
public static IEnumerable<CurveData> Convert(IEnumerable<CntrlComparison> cntrlComparison)
{
var comparisonGroups =
from comparison in cntrlComparison
group comparison by comparison.CurveID into curves
select new
{
CurveID = curves.Key,
FitType = from curve in curves
group curve by new {curve.FitGi, curve.FitGammaStar} into grp
select new
{
grp.Key.FitGi,
grp.Key.FitGammaStar,
Comparison = grp.SingleOrDefault()
}
};
foreach (var comparisonGroup in comparisonGroups)
{
if (comparisonGroup.FitType.Count() != 4)
throw new ArgumentException(
$"{comparisonGroup.CurveID} should have 4 data sets, only has {comparisonGroup.FitType.Count()}");
var curveData = new CurveData {CurveId = comparisonGroup.CurveID};
foreach (var fitType in comparisonGroup.FitType)
{
var paramSet = ConvertParamSet(fitType.Comparison);
// fixed = not fitted
// estimated = fitted
// gi = internal conductance = "Cnd"
// gammastar = chloroplastic CO2 partial pressure photocompensation point = "Cmp"
// put each comparison into the correct curve location
if (!fitType.FitGi && !fitType.FitGammaStar)
curveData.FixedCndFixedCmp = paramSet;
else if (!fitType.FitGi && fitType.FitGammaStar)
curveData.FixedCndEstimatedCmp = paramSet;
else if (fitType.FitGi && !fitType.FitGammaStar)
curveData.EstimatedCndFixedCmp = paramSet;
else if (fitType.FitGi && fitType.FitGammaStar)
curveData.EstimatedCndEstimatedCmp = paramSet;
}
// Check all data is present
if (curveData.FixedCndFixedCmp == null)
throw new ArgumentException(
$"{comparisonGroup.CurveID} missing data for {ReflectionExtensions.GetPropertyDisplayName<CurveData>(c=>c.FixedCndFixedCmp)}");
if (curveData.FixedCndEstimatedCmp == null)
throw new ArgumentException(
$"{comparisonGroup.CurveID} missing data for {ReflectionExtensions.GetPropertyDisplayName<CurveData>(c=>c.FixedCndEstimatedCmp)}");
if (curveData.EstimatedCndFixedCmp == null)
throw new ArgumentException(
$"{comparisonGroup.CurveID} missing data for {ReflectionExtensions.GetPropertyDisplayName<CurveData>(c=>c.EstimatedCndFixedCmp)}");
if (curveData.EstimatedCndEstimatedCmp == null)
throw new ArgumentException(
$"{comparisonGroup.CurveID} missing data for {ReflectionExtensions.GetPropertyDisplayName<CurveData>(c=>c.EstimatedCndEstimatedCmp)}");
yield return curveData;
}
}
private static CurveParamSet ConvertParamSet(CntrlComparison comparison)
{
var curveParamSet = new CurveParamSet();
foreach (var fittingInfo in comparison.FittingInfo)
{
Set(curveParamSet, fittingInfo);
}
foreach (var photosyntheticInfo in comparison.PhotosyntheticInfo)
{
Set(curveParamSet, photosyntheticInfo);
}
return curveParamSet;
}
private static void Set(CurveParamSet paramSet, CntrlComparisonPhotosyntheticInfo item)
{
AddXyIfInRange(item.CO2cc, item.Ac, paramSet.AcChloroData.Add); // Ac(y),CO2cc(x)
AddXyIfInRange(item.CO2cj, item.Aj, paramSet.AjChloroData.Add); // Aj(y),CO2cj(x)
AddXyIfInRange(item.CO2ct, item.At, paramSet.AtChloroData.Add); // At(y),CO2ct(x)
AddXyIfInRange(item.CO2i, item.Ac, paramSet.AcInterData.Add); // Ac(y),CO2i(x)
AddXyIfInRange(item.CO2i, item.Aj, paramSet.AcInterData.Add); // Aj(y),CO2i(x)
AddXyIfInRange(item.CO2i, item.At, paramSet.AtInterData.Add); // Aj(y),CO2i(x)
}
private static void AddXyIfInRange(double x, double y, Action<XyPoint> set)
{
var xyPoint = new XyPoint(x, y);
if (xyPoint.YIsInRange(-20.0, 50.0))
set(xyPoint);
}
private static void Set(CurveParamSet paramSet, CntrlComparisonFittingInfo fittingInfo)
{
var xyPoint1 = new XyPoint(fittingInfo.PCO2c, fittingInfo.AnetMeas); // AnetMeas(y), PCO2c(x)
var xyPoint2 = new XyPoint(fittingInfo.PCO2i, fittingInfo.AnetMeas);
switch (fittingInfo.PointLimitType)
{
case 1:
paramSet.AnetMeasChloro1Data.Add(xyPoint1);
paramSet.AnetMeasInter1Data.Add(xyPoint2);
break;
case 2:
paramSet.AnetMeasChloro2Data.Add(xyPoint1);
paramSet.AnetMeasInter2Data.Add(xyPoint2);
break;
case 3:
paramSet.AnetMeasChloro3Data.Add(xyPoint1);
paramSet.AnetMeasInter3Data.Add(xyPoint2);
break;
}
}
}
}
Core/Charter/CurveParamSet.cs
-145
View File
@@ -1,6 +1,4 @@
using System.Collections.Generic;
using System.IO;
using LeafWeb.Core.Utility;
namespace LeafWeb.Core.Charter
{
@@ -19,148 +17,5 @@ namespace LeafWeb.Core.Charter
public List<XyPoint> AcInterData { get; } = new List<XyPoint>();
public List<XyPoint> AjInterData { get; } = new List<XyPoint>();
public List<XyPoint> AtInterData { get; } = new List<XyPoint>();
public CurveParamSet(TextReader sr, ref int lineNbr, ref string curveId)
{
bool curveIdSet = false, doneWithAnet = false;
string line;
List<string> phrases;
while (!doneWithAnet)
{
lineNbr++;
line = sr.ReadLine();
if (line == null)
{
throw new ParseException("Unexpected end-of-file at line " + lineNbr);
}
phrases = SplitCsvLine(line);
var firstField = phrases[0];
if (firstField.Equals("CO2i"))
{
doneWithAnet = true;
}
else
{
// The fields on the line:
// Column Name
// 0 CurveID
// 1 ChlFlUse
// 2 FitGi
// 3 FitGamma
// 4 FitKco
// 5 FitRd
// 6 FitAlpha
// 7 LimitCombina
// 8 PCO2i
// 9 PCO2c
// 10 AnetMeas
// 11 AnetCal
// 12 weitedrms
// 13 PointLimitType
if (!curveIdSet)
{
curveId = firstField;
curveIdSet = true;
}
var xyPoint1 = new XyPoint(phrases[9], phrases[10]); // AnetMeas(y), PCO2c(x)
var xyPoint2 = new XyPoint(phrases[8], phrases[10]);
var pointLimitType = int.Parse(phrases[13]);
switch (pointLimitType)
{
case 1:
AnetMeasChloro1Data.Add(xyPoint1);
AnetMeasInter1Data.Add(xyPoint2);
break;
case 2:
AnetMeasChloro2Data.Add(xyPoint1);
AnetMeasInter2Data.Add(xyPoint2);
break;
case 3:
AnetMeasChloro3Data.Add(xyPoint1);
AnetMeasInter3Data.Add(xyPoint2);
break;
}
}
}
// The next set of lines will have three pairs of x,y-coordinates to save.
// A blank line signals the end of the data.
var moreData = true;
while (moreData)
{
// The fields on the line:
// Column Name
// 0 CO2i
// 1 CO2cc
// 2 Ac
// 3 CO2cj
// 4 Aj
// 5 CO2ct
// 6 At
lineNbr++;
line = sr.ReadLine();
if (line == null)
{
throw new ParseException("Unexpected end-of-file at line " + lineNbr);
}
if (line.Length == 0)
moreData = false;
else
{
phrases = SplitCsvLine(line);
var xyPoint1 = new XyPoint(phrases[1],phrases[2]); // Ac(y),CO2cc(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AcChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[3], phrases[4]); // Aj(y),CO2cj(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AjChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[5], phrases[6]); // At(y),CO2ct(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AtChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[2]); // Ac(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AcInterData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[4]); // Aj(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AjInterData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[6]); // At(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AtInterData.Add(xyPoint1);
}
}
}
/// <summary>
/// This method assumes that the argument is a comma-, blank-, or
/// tab-separated set of strings. It returns an ArrayList of those
/// quantities. Consecutive commas will be returned as an empty string,
/// but all empty strings at the end of the line will be thrown away.
/// </summary>
/// <param name="line"></param>
/// <returns></returns>
private static List<string> SplitCsvLine(string line)
{
int i;
var separator = new [] {',', ' ', '\t'};
var phrases = line.Split(separator);
var retPhrases = new List<string>();
for (i = 0; i < phrases.Length; i++)
{
var phrase = phrases[i].Trim();
if (phrase.Length > 0)
retPhrases.Add(phrase);
}
return retPhrases;
}
}
}
Core/Charter/XYPoint.cs
+6 -6
View File
@@ -2,16 +2,16 @@
{
public class XyPoint
{
public XyPoint(string x, string y)
{
X = double.Parse(x);
Y = double.Parse(y);
}
public double X { get; private set; }
public double Y { get; private set; }
public XyPoint(double x, double y)
{
X = x;
Y = y;
}
public bool YIsInRange(double lowEnd, double highEnd)
{
return (Y >= lowEnd) && (Y <= highEnd);
Core/CharterOld/CurveData.cs
+37
View File
@@ -0,0 +1,37 @@
using System.IO;
namespace LeafWeb.Core.CharterOld
{
public class CurveData
{
private readonly string _curveId;
public string CurveId => _curveId;
// 1
public CurveParamSet FixedCndFixedCmp { get; }
// 2
public CurveParamSet FixedCndEstimatedCmp { get; }
// 3
public CurveParamSet EstimatedCndFixedCmp { get; }
// 4
public CurveParamSet EstimatedCndEstimatedCmp { get; }
public CurveData(TextReader sr, ref int lineNbr)
{
// For each curve in the output file there are four sets of data.
FixedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
FixedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndFixedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
EstimatedCndEstimatedCmp = new CurveParamSet(sr, ref lineNbr, ref _curveId);
}
}
}
Core/Charter/CurveDataList.cs → Core/CharterOld/CurveDataList.cs
+1 -1
View File
@@ -1,7 +1,7 @@
using System.Collections.Generic;
using System.IO;
namespace LeafWeb.Core.Charter
namespace LeafWeb.Core.CharterOld
{
public class CurveDataList
{
Core/CharterOld/CurveParamSet.cs
+166
View File
@@ -0,0 +1,166 @@
using System.Collections.Generic;
using System.IO;
using LeafWeb.Core.Utility;
namespace LeafWeb.Core.CharterOld
{
public class CurveParamSet
{
public List<XyPoint> AnetMeasChloro1Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2c, for PointLimitType=1
public List<XyPoint> AnetMeasChloro2Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2c, for PointLimitType=2
public List<XyPoint> AnetMeasChloro3Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2c, for PointLimitType=3
public List<XyPoint> AnetMeasInter1Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2i, for PointLimitType=1
public List<XyPoint> AnetMeasInter2Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2i, for PointLimitType=2
public List<XyPoint> AnetMeasInter3Data { get; } = new List<XyPoint>(); // y=AnetMeas column, x=PCO2i, for PointLimitType=3
public List<XyPoint> AcChloroData { get; } = new List<XyPoint>();
public List<XyPoint> AjChloroData { get; } = new List<XyPoint>();
public List<XyPoint> AtChloroData { get; } = new List<XyPoint>();
public List<XyPoint> AcInterData { get; } = new List<XyPoint>();
public List<XyPoint> AjInterData { get; } = new List<XyPoint>();
public List<XyPoint> AtInterData { get; } = new List<XyPoint>();
public CurveParamSet(TextReader sr, ref int lineNbr, ref string curveId)
{
bool curveIdSet = false, doneWithAnet = false;
string line;
List<string> phrases;
while (!doneWithAnet)
{
lineNbr++;
line = sr.ReadLine();
if (line == null)
{
throw new ParseException("Unexpected end-of-file at line " + lineNbr);
}
phrases = SplitCsvLine(line);
var firstField = phrases[0];
if (firstField.Equals("CO2i"))
{
doneWithAnet = true;
}
else
{
// The fields on the line:
// Column Name
// 0 CurveID
// 1 ChlFlUse
// 2 FitGi
// 3 FitGamma
// 4 FitKco
// 5 FitRd
// 6 FitAlpha
// 7 LimitCombina
// 8 PCO2i
// 9 PCO2c
// 10 AnetMeas
// 11 AnetCal
// 12 weitedrms
// 13 PointLimitType
if (!curveIdSet)
{
curveId = firstField;
curveIdSet = true;
}
var xyPoint1 = new XyPoint(phrases[9], phrases[10]); // AnetMeas(y), PCO2c(x)
var xyPoint2 = new XyPoint(phrases[8], phrases[10]);
var pointLimitType = int.Parse(phrases[13]);
switch (pointLimitType)
{
case 1:
AnetMeasChloro1Data.Add(xyPoint1);
AnetMeasInter1Data.Add(xyPoint2);
break;
case 2:
AnetMeasChloro2Data.Add(xyPoint1);
AnetMeasInter2Data.Add(xyPoint2);
break;
case 3:
AnetMeasChloro3Data.Add(xyPoint1);
AnetMeasInter3Data.Add(xyPoint2);
break;
}
}
}
// The next set of lines will have three pairs of x,y-coordinates to save.
// A blank line signals the end of the data.
var moreData = true;
while (moreData)
{
// The fields on the line:
// Column Name
// 0 CO2i
// 1 CO2cc
// 2 Ac
// 3 CO2cj
// 4 Aj
// 5 CO2ct
// 6 At
lineNbr++;
line = sr.ReadLine();
if (line == null)
{
throw new ParseException("Unexpected end-of-file at line " + lineNbr);
}
if (line.Length == 0)
moreData = false;
else
{
phrases = SplitCsvLine(line);
var xyPoint1 = new XyPoint(phrases[1],phrases[2]); // Ac(y),CO2cc(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AcChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[3], phrases[4]); // Aj(y),CO2cj(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AjChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[5], phrases[6]); // At(y),CO2ct(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AtChloroData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[2]); // Ac(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AcInterData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[4]); // Aj(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AjInterData.Add(xyPoint1);
xyPoint1 = new XyPoint(phrases[0], phrases[6]); // At(y),CO2i(x)
if (xyPoint1.YIsInRange(-20.0, 50.0))
AtInterData.Add(xyPoint1);
}
}
}
/// <summary>
/// This method assumes that the argument is a comma-, blank-, or
/// tab-separated set of strings. It returns an ArrayList of those
/// quantities. Consecutive commas will be returned as an empty string,
/// but all empty strings at the end of the line will be thrown away.
/// </summary>
/// <param name="line"></param>
/// <returns></returns>
private static List<string> SplitCsvLine(string line)
{
int i;
var separator = new [] {',', ' ', '\t'};
var phrases = line.Split(separator);
var retPhrases = new List<string>();
for (i = 0; i < phrases.Length; i++)
{
var phrase = phrases[i].Trim();
if (phrase.Length > 0)
retPhrases.Add(phrase);
}
return retPhrases;
}
}
}
Core/CharterOld/XYPoint.cs
+20
View File
@@ -0,0 +1,20 @@
namespace LeafWeb.Core.CharterOld
{
public class XyPoint
{
public XyPoint(string x, string y)
{
X = double.Parse(x);
Y = double.Parse(y);
}
public double X { get; private set; }
public double Y { get; private set; }
public bool YIsInRange(double lowEnd, double highEnd)
{
return (Y >= lowEnd) && (Y <= highEnd);
}
}
}
Core/Core.csproj
+9 -4
View File
@@ -56,18 +56,22 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Charter\CurveData.cs" />
<Compile Include="Charter\CurveDataConverter.cs" />
<Compile Include="Charter\CurveParamSet.cs" />
<Compile Include="Charter\XYPoint.cs" />
<Compile Include="Models\CntrlComparison.cs" />
<Compile Include="Models\CntrlComparisonFittingInfo.cs" />
<Compile Include="Models\CntrlComparisonPhotosyntheticInfo.cs" />
<Compile Include="Charter\CurveDataList.cs" />
<Compile Include="Charter\CurveData.cs" />
<Compile Include="Charter\CurveParamSet.cs" />
<Compile Include="CharterOld\CurveDataList.cs" />
<Compile Include="CharterOld\CurveData.cs" />
<Compile Include="CharterOld\CurveParamSet.cs" />
<Compile Include="Models\LeafInput.cs" />
<Compile Include="Models\LeafInputData.cs" />
<Compile Include="Models\LeafInputFile.cs" />
<Compile Include="Models\LeafInputPhotosynthetic.cs" />
<Compile Include="Models\LeafInputSite.cs" />
<Compile Include="Charter\XYPoint.cs" />
<Compile Include="CharterOld\XYPoint.cs" />
<Compile Include="Utility\BoolTypeConverter.cs" />
<Compile Include="Parsers\CntrlComparisonParser.cs" />
<Compile Include="Parsers\CsvParserBase.cs" />
@@ -76,6 +80,7 @@
<Compile Include="Parsers\LeafInputCsvParser.cs" />
<Compile Include="Utility\ParsedObjectFactory.cs" />
<Compile Include="Utility\ParseException.cs" />
<Compile Include="Utility\ReflectionExtensions.cs" />
<Compile Include="Utility\StringExtensions.cs" />
</ItemGroup>
<ItemGroup>
Core/Models/CntrlComparison.cs
+7 -1
View File
@@ -1,5 +1,5 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
namespace LeafWeb.Core.Models
{
@@ -11,5 +11,11 @@ namespace LeafWeb.Core.Models
{
public virtual IEnumerable<CntrlComparisonFittingInfo> FittingInfo { get; set; }
public virtual IEnumerable<CntrlComparisonPhotosyntheticInfo> PhotosyntheticInfo { get; set; }
public string CurveID => FittingInfo.First().CurveID;
public bool FitGi => FittingInfo.First().FitGi;
public bool FitGammaStar => FittingInfo.First().FitGammaStar;
}
}
Core/Utility/ReflectionExtensions.cs
+46
View File
@@ -0,0 +1,46 @@
using System;
using System.ComponentModel;
using System.Diagnostics;
using System.Linq;
using System.Linq.Expressions;
using System.Reflection;
using Fasterflect;
namespace LeafWeb.Core.Utility
{
public static class ReflectionExtensions
{
public static string GetPropertyDisplayName<T>(Expression<Func<T, object>> propertyExpression)
{
var memberInfo = GetPropertyInformation(propertyExpression.Body);
if (memberInfo == null)
{
throw new ArgumentException("No property reference expression was found.", nameof(propertyExpression));
}
var attr = memberInfo.Attributes<DisplayNameAttribute>().SingleOrDefault();
return attr == null ? memberInfo.Name : attr.DisplayName;
}
public static MemberInfo GetPropertyInformation(Expression propertyExpression)
{
Debug.Assert(propertyExpression != null, "propertyExpression != null");
var memberExpr = propertyExpression as MemberExpression;
if (memberExpr == null)
{
var unaryExpr = propertyExpression as UnaryExpression;
if (unaryExpr != null && unaryExpr.NodeType == ExpressionType.Convert)
{
memberExpr = unaryExpr.Operand as MemberExpression;
}
}
if (memberExpr != null && memberExpr.Member.MemberType == MemberTypes.Property)
{
return memberExpr.Member;
}
return null;
}
}
}