fix type missmatch

master
xieguigang 8 years ago
parent b518f1928f
commit 0d6a53117b

@ -1 +1 @@
Subproject commit 5f824b9ec8218fe109ae9bb49c6593b508c1dea2
Subproject commit 88eeab2f84b3bbae371b397973297ff8aa614eb3

@ -3,11 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27428.2027
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "thinkChart", "thinkChart\thinkChart.njsproj", "{F3C0F5AB-B554-4EF8-9DF0-482240FE020D}"
ProjectSection(ProjectDependencies) = postProject
{8C2DAE18-8B11-4B37-A4EC-0234D7FCCF2A} = {8C2DAE18-8B11-4B37-A4EC-0234D7FCCF2A}
EndProjectSection
EndProject
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "Linq.ts", "..\TsLinq\Linq.ts\Linq.ts.njsproj", "{E0AEC189-6D05-47E4-9F69-DAFE43AC8398}"
EndProject
Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "svg", "svg\SVG\svg.njsproj", "{8C2DAE18-8B11-4B37-A4EC-0234D7FCCF2A}"
@ -18,10 +13,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F3C0F5AB-B554-4EF8-9DF0-482240FE020D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F3C0F5AB-B554-4EF8-9DF0-482240FE020D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F3C0F5AB-B554-4EF8-9DF0-482240FE020D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F3C0F5AB-B554-4EF8-9DF0-482240FE020D}.Release|Any CPU.Build.0 = Release|Any CPU
{E0AEC189-6D05-47E4-9F69-DAFE43AC8398}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E0AEC189-6D05-47E4-9F69-DAFE43AC8398}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E0AEC189-6D05-47E4-9F69-DAFE43AC8398}.Release|Any CPU.ActiveCfg = Release|Any CPU

@ -117,16 +117,16 @@ namespace Math2D {
}
// 通过分别计算ticks的数量差值是否容纳了输入的[min,max]范围来判断是否合适
var maxSteps = candidateArray.Max(candidate => candidate.length);
var dSteps = maxSteps - candidateArray.Select(candidate => Math.abs(candidate.length - ticks));
var dMin = inputRange.Length - candidateArray.Select(candidate => Math.abs(candidate.Min() - inputRange.Min()));
var dMax = inputRange.Length - candidateArray.Select(candidate => Math.abs(candidate.Max() - inputRange.Max()));
var maxSteps = new Vector(candidateArray.Max(candidate => candidate.length));
var dSteps: Vector = maxSteps.Subtract(candidateArray.Select(candidate => Math.abs(candidate.length - ticks)));
var dMin: Vector = inputRange.Length - candidateArray.Select(candidate => Math.abs(candidate.Min() - inputRange.Min()));
var dMax: Vector = inputRange.Length - candidateArray.Select(candidate => Math.abs(candidate.Max() - inputRange.Max()));
dSteps = dSteps / dSteps.Max();
dMin = dMin / dMin.Max();
dMax = dMax / dMax.Max();
dSteps = dSteps.Divide(dSteps.Max());
dMin = dMin.Divide(dMin.Max());
dMax = dMax.Divide(dMax.Max());
var scores = dSteps * 0.8 + dMin * 0.1 + dMax * 0.1;
var scores = (dSteps.Multiply(0.8)).Add(dMin.Multiply(0.1)).Add(dMax.Multiply(0.1));
var tickArray: number[] = candidateArray[Which.Max(scores)];
// 2018-2-1

Loading…
Cancel
Save