Repository: incubator-hivemall Updated Branches: refs/heads/v0.5.0 2e22bda43 -> 147f26fa2
Fixed NOTICE file and License headers Project: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/commit/147f26fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/tree/147f26fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/diff/147f26fa Branch: refs/heads/v0.5.0 Commit: 147f26fa25bacb4134256a01f6ff84e14a505b7a Parents: 2e22bda Author: Makoto Yui <m...@apache.org> Authored: Tue Feb 6 16:53:42 2018 +0900 Committer: Makoto Yui <m...@apache.org> Committed: Tue Feb 6 16:53:42 2018 +0900 ---------------------------------------------------------------------- NOTICE | 26 +------- .../smile/classification/DecisionTree.java | 18 ------ .../smile/regression/RegressionTree.java | 18 ------ .../main/java/hivemall/utils/codec/Base91.java | 18 ------ .../main/java/hivemall/utils/math/FastMath.java | 65 +++++++------------- 5 files changed, 24 insertions(+), 121 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/147f26fa/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index a769af3..8932a74 100644 --- a/NOTICE +++ b/NOTICE @@ -11,36 +11,12 @@ AIST and Treasure Data, Inc. and others. * Copyright 2015-2016 Makoto Yui * Copyright 2015-2016 Treasure Data, Inc. ------------------------------------------------------------------------------------------------------- This software contains code derived from the following projects: * Copyright 2010 Haifeng Li - - hivemall/core/src/main/java/hivemall/smile/classification/DecisionTree.java - hivemall/core/src/main/java/hivemall/smile/regression/RegressionTree.java - - contains a modified version of Smile's RandomForest, which can be obtained at: - - https://github.com/haifengl/smile - * Copyright 2000-2006 Joachim Henke - - hivemall/core/src/main/java/hivemall/utils/codec/Base91.java - - contains a modified version of Base91 encoder/decoder, which can be obtained at: - - https://github.com/bwaldvogel/base91 - * Copyright 2012-2015 Jeff Hain -* Copyright 1993 by Sun Microsystems, Inc. - - hivemall/core/src/main/java/hivemall/utils/math/FastMath.java - - contains a modified version FastMath code, which can be obtained at: - - https://github.com/jeffhain/jafama/ - - It partially contains a modified version of fdlibm, developed at Sun Microsystems, Inc. +* Copyright 1993 Sun Microsystems, Inc. ------------------------------------------------------------------------------------------------------ The project site uses the following open source softwares: http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/147f26fa/core/src/main/java/hivemall/smile/classification/DecisionTree.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/smile/classification/DecisionTree.java b/core/src/main/java/hivemall/smile/classification/DecisionTree.java index c147a71..f6ed45f 100644 --- a/core/src/main/java/hivemall/smile/classification/DecisionTree.java +++ b/core/src/main/java/hivemall/smile/classification/DecisionTree.java @@ -1,22 +1,4 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* * Copyright (c) 2010 Haifeng Li * * Licensed under the Apache License, Version 2.0 (the "License"); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/147f26fa/core/src/main/java/hivemall/smile/regression/RegressionTree.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/smile/regression/RegressionTree.java b/core/src/main/java/hivemall/smile/regression/RegressionTree.java index 0670876..dadabe7 100755 --- a/core/src/main/java/hivemall/smile/regression/RegressionTree.java +++ b/core/src/main/java/hivemall/smile/regression/RegressionTree.java @@ -1,22 +1,4 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* * Copyright (c) 2010 Haifeng Li * * Licensed under the Apache License, Version 2.0 (the "License"); http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/147f26fa/core/src/main/java/hivemall/utils/codec/Base91.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/utils/codec/Base91.java b/core/src/main/java/hivemall/utils/codec/Base91.java index 27bdf62..46a0b14 100644 --- a/core/src/main/java/hivemall/utils/codec/Base91.java +++ b/core/src/main/java/hivemall/utils/codec/Base91.java @@ -1,22 +1,4 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* * basE91 encoding/decoding routines * * Copyright (c) 2000-2006 Joachim Henke http://git-wip-us.apache.org/repos/asf/incubator-hivemall/blob/147f26fa/core/src/main/java/hivemall/utils/math/FastMath.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/hivemall/utils/math/FastMath.java b/core/src/main/java/hivemall/utils/math/FastMath.java index d27d6f8..1486c48 100644 --- a/core/src/main/java/hivemall/utils/math/FastMath.java +++ b/core/src/main/java/hivemall/utils/math/FastMath.java @@ -1,20 +1,29 @@ /* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * Copyright 2012-2015 Jeff Hain * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* + * ============================================================================= + * Notice of fdlibm package this program is partially derived from: + * + * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * + * Developed at SunSoft, a Sun Microsystems, Inc. business. + * Permission to use, copy, modify, and distribute this + * software is freely granted, provided that this notice + * is preserved. + * ============================================================================= */ package hivemall.utils.math; @@ -98,34 +107,6 @@ public final class FastMath { return 1 / (1 + exp(-x)); } - /* - * Copyright 2012-2015 Jeff Hain - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - /* - * ============================================================================= - * Notice of fdlibm package this program is partially derived from: - * - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunSoft, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ============================================================================= - */ - /** * Based on Jafama (https://github.com/jeffhain/jafama/) version 2.2. */