Skip to content

Commit

Permalink
Update build files for rename
Browse files Browse the repository at this point in the history
  • Loading branch information
Jamie Bullock committed Apr 2, 2019
1 parent 0d4d068 commit cc50555
Show file tree
Hide file tree
Showing 8 changed files with 88 additions and 83 deletions.
4 changes: 2 additions & 2 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ML_FEATURE_EXTRACTION_SRC = $(ML_FEATURE_EXTRACTION_PATH)/ml_feature_extraction.

ML_CLASSIFICATION_EXT = ml_adaboost.cpp \
ml_dtw.cpp \
ml_hmm.cpp \
ml_hmmc.cpp \
ml_randforest.cpp \
ml_svm.cpp \
ml_anbc.cpp \
Expand All @@ -37,7 +37,7 @@ ML_CLASSIFICATION_EXT = ml_adaboost.cpp \

ML_REGRESSION_EXT = ml_linreg.cpp \
ml_logreg.cpp \
ml_mlp.cpp
ml_ann.cpp

ML_FEATURE_EXTRACTION_EXT = ml_minmax.cpp \
ml_peak.cpp \
Expand Down
137 changes: 72 additions & 65 deletions build/macosx/ml.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "7D7DA06D18F69B4300F417F6"
BuildableName = "ml.hmm.mxo"
BlueprintName = "ml.hmm max"
BlueprintName = "ml.hmmc max"
ReferencedContainer = "container:ml.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -113,8 +113,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7D7DA03D18F69B0F00F417F6"
BuildableName = "ml.mlp.mxo"
BlueprintName = "ml.mlp max"
BuildableName = "ml.ann.mxo"
BlueprintName = "ml.ann max"
ReferencedContainer = "container:ml.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -264,7 +264,6 @@
buildConfiguration = "Development"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
Expand All @@ -284,7 +283,6 @@
buildConfiguration = "Development"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "7D7DA13718F7DCEC00F417F6"
BuildableName = "ml.hmm.pd_darwin"
BlueprintName = "ml.hmm pd"
BlueprintName = "ml.hmmc pd"
ReferencedContainer = "container:ml.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down Expand Up @@ -113,8 +113,8 @@
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "7D7DA11918F7DCBD00F417F6"
BuildableName = "ml.mlp.pd_darwin"
BlueprintName = "ml.mlp pd"
BuildableName = "ml.ann.pd_darwin"
BlueprintName = "ml.ann pd"
ReferencedContainer = "container:ml.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand Down
6 changes: 3 additions & 3 deletions build/win32/ml.minmax.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\sources\regression\ml_mlp.cpp" />
<ClCompile Include="..\..\sources\regression\ml_ann.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<SccProjectName>
</SccProjectName>
<SccLocalPath>
</SccLocalPath>
<ProjectGuid>{3e34fe40-eab3-45c3-afc3-0d5ad3009ea8}</ProjectGuid>
<ProjectName>ml.mlp</ProjectName>
<ProjectName>ml.ann</ProjectName>
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
Expand Down Expand Up @@ -517,4 +517,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions build/win32/ml.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.svm", "myext.vcxproj", "
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml-core", "ml-core.vcxproj", "{D04441D0-3849-4E06-827C-F4E99EA385ED}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.mlp", "ml.mlp.vcxproj", "{3E34FE40-EAB3-45C3-AFC3-0D5AD3009EA8}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.ann", "ml.ann.vcxproj", "{3E34FE40-EAB3-45C3-AFC3-0D5AD3009EA8}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.linreg", "ml.linreg.vcxproj", "{89300141-AB09-490F-AF48-7E06FBD2DBF7}"
EndProject
Expand All @@ -26,7 +26,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.dtw", "ml.dtw.vcxproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.gmm", "ml.gmm.vcxproj", "{F615C09B-5B3C-4DCB-8C23-9C63C847DD38}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.hmm", "ml.hmm.vcxproj", "{D475D001-E206-453E-AC4F-48DCD20690C4}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.hmmc", "ml.hmmc.vcxproj", "{D475D001-E206-453E-AC4F-48DCD20690C4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml.knn", "ml.knn.vcxproj", "{61F8479D-8588-4291-BFC3-C0BE2A0EEE28}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions package/help/ml.lib.maxpat
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 520.0, 453.0, 46.0, 22.0 ],
"text" : "ml.mlp"
"text" : "ml.ann"
}

}
Expand Down Expand Up @@ -188,7 +188,7 @@
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 519.0, 268.9791259765625, 61.0, 22.0 ],
"text" : "ml.hmm"
"text" : "ml.hmmc"
}

}
Expand Down
2 changes: 1 addition & 1 deletion package/package-info.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}
,
"tags" : [ "machine learning", "feature extraction" ],
"version" : "0.19.0",
"version" : "0.20.3",
"website" : "http://irl.studio",
"filelist" : {
"externals" : [
Expand Down

0 comments on commit cc50555

Please sign in to comment.